Changeset 15253 in webkit


Ignore:
Timestamp:
Jul 9, 2006, 8:10:21 AM (19 years ago)
Author:
darin
Message:

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:
Location:
trunk/WebCore
Files:
226 edited
46 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r15250 r15253  
     12006-07-09  Darin Adler  <darin@apple.com>
     2
     3        Rubber stamped by Maciej (kinda).
     4
     5        - did the next pass of renaming (used do-webcore-rename script)
     6          this takes care of most of the remaining KWQ names (almost all)
     7
     8        * WebCore+SVG/DOMList.h:
     9        * WebCore.vcproj/WebCore/WebCore.vcproj:
     10        * WebCore.xcodeproj/project.pbxproj:
     11        * WebCoreSources.bkl:
     12        * bindings/js/kjs_dom.cpp:
     13        * bindings/js/kjs_window.cpp:
     14        * bindings/objc/DOMHTML.mm:
     15        * bridge/mac/FrameMac.h:
     16        * bridge/mac/FrameMac.mm:
     17        * bridge/mac/WebCoreFrameBridge.mm:
     18        * bridge/mac/WebCoreSettings.h:
     19        * bridge/mac/WebCoreSettings.mm:
     20        * bridge/win/FrameWin.cpp:
     21        * css/CSSPrimitiveValue.cpp:
     22        * css/CSSValueKeywords.in:
     23        * css/MediaQueryEvaluator.cpp:
     24        * css/cssparser.cpp:
     25        * css/cssstyleselector.cpp:
     26        * css/cssstyleselector.h:
     27        * dom/CharacterData.cpp:
     28        * dom/CharacterData.h:
     29        * dom/Document.cpp:
     30        * dom/Element.cpp:
     31        * dom/Element.h:
     32        * dom/EventTargetNode.cpp:
     33        * dom/EventTargetNode.h:
     34        * dom/Node.cpp:
     35        * dom/Node.h:
     36        * dom/Position.cpp:
     37        * dom/ProcessingInstruction.cpp:
     38        * dom/QualifiedName.cpp:
     39        * dom/QualifiedName.h:
     40        * dom/XMLTokenizer.cpp: Added.
     41        * dom/xml_tokenizer.cpp: Removed.
     42        * dom/xml_tokenizer.h: Removed.
     43        * editing/EditAction.h:
     44        * editing/HTMLInterchange.cpp:
     45        * editing/HTMLInterchange.h:
     46        * editing/Selection.h:
     47        * editing/SelectionController.h:
     48        * editing/TextAffinity.h:
     49        * editing/TextIterator.cpp:
     50        * editing/TextIterator.h:
     51        * editing/VisiblePosition.h:
     52        * editing/htmlediting.cpp:
     53        * editing/markup.cpp:
     54        * editing/markup.h:
     55        * editing/visible_units.cpp:
     56        * editing/visible_units.h:
     57        * html/HTMLDocument.cpp:
     58        * html/HTMLFontElement.cpp:
     59        * html/HTMLInputElement.cpp:
     60        * html/HTMLKeygenElement.cpp:
     61        * html/HTMLSelectElement.h:
     62        * html/HTMLTextAreaElement.cpp:
     63        * html/HTMLTextFieldInnerElement.cpp:
     64        * html/HTMLTokenizer.cpp:
     65        * html/HTMLTokenizer.h:
     66        * kcanvas/KCanvasContainer.cpp: Removed.
     67        * kcanvas/KCanvasContainer.h: Removed.
     68        * kcanvas/KCanvasCreator.cpp:
     69        * kcanvas/KCanvasFilters.cpp:
     70        * kcanvas/KCanvasFilters.h:
     71        * kcanvas/KCanvasMatrix.cpp:
     72        * kcanvas/KCanvasMatrix.h:
     73        * kcanvas/KCanvasPath.cpp:
     74        * kcanvas/KCanvasPath.h:
     75        * kcanvas/KCanvasResources.cpp:
     76        * kcanvas/KCanvasResources.h:
     77        * kcanvas/KCanvasTreeDebug.cpp:
     78        * kcanvas/KCanvasTreeDebug.h:
     79        * kcanvas/RenderForeignObject.cpp:
     80        * kcanvas/RenderForeignObject.h:
     81        * kcanvas/RenderPath.cpp:
     82        * kcanvas/RenderPath.h:
     83        * kcanvas/RenderSVGContainer.cpp: Added.
     84        * kcanvas/RenderSVGContainer.h: Added.
     85        * kcanvas/RenderSVGImage.cpp:
     86        * kcanvas/RenderSVGImage.h:
     87        * kcanvas/RenderSVGText.cpp:
     88        * kcanvas/RenderSVGText.h:
     89        * kcanvas/device/KRenderingPaintServer.h:
     90        * kcanvas/device/KRenderingPaintServerGradient.cpp:
     91        * kcanvas/device/KRenderingPaintServerGradient.h:
     92        * kcanvas/device/KRenderingPaintServerPattern.cpp:
     93        * kcanvas/device/KRenderingPaintServerPattern.h:
     94        * kcanvas/device/KRenderingPaintServerSolid.cpp:
     95        * kcanvas/device/KRenderingPaintServerSolid.h:
     96        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
     97        * kcanvas/device/quartz/KCanvasItemQuartz.h:
     98        * kcanvas/device/quartz/KCanvasResourcesQuartz.h:
     99        * kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
     100        * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
     101        * kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
     102        * ksvg2/css/CSSValueKeywords.in:
     103        * ksvg2/css/SVGRenderStyleDefs.cpp:
     104        * ksvg2/misc/KCanvasRenderingStyle.cpp:
     105        * ksvg2/misc/KSVGTimeScheduler.cpp:
     106        * ksvg2/svg/SVGAElement.cpp:
     107        * ksvg2/svg/SVGAnimateTransformElement.cpp:
     108        * ksvg2/svg/SVGAnimateTransformElement.h:
     109        * ksvg2/svg/SVGGElement.cpp:
     110        * ksvg2/svg/SVGHelper.cpp:
     111        * ksvg2/svg/SVGHelper.h:
     112        * ksvg2/svg/SVGImageElement.cpp:
     113        * ksvg2/svg/SVGLinearGradientElement.cpp:
     114        * ksvg2/svg/SVGMarkerElement.cpp:
     115        * ksvg2/svg/SVGMaskElement.cpp:
     116        * ksvg2/svg/SVGMatrix.cpp:
     117        * ksvg2/svg/SVGMatrix.h:
     118        * ksvg2/svg/SVGPatternElement.cpp:
     119        * ksvg2/svg/SVGRadialGradientElement.cpp:
     120        * ksvg2/svg/SVGSVGElement.cpp:
     121        * ksvg2/svg/SVGStyledElement.h:
     122        * ksvg2/svg/SVGStyledTransformableElement.cpp:
     123        * ksvg2/svg/SVGStyledTransformableElement.h:
     124        * ksvg2/svg/SVGSwitchElement.cpp:
     125        * ksvg2/svg/SVGTextElement.cpp:
     126        * ksvg2/svg/SVGTransformable.h:
     127        * ksvg2/svg/SVGUseElement.cpp:
     128        * kwq/AffineTransform.cpp: Added.
     129        * kwq/AffineTransform.h: Added.
     130        * kwq/DeprecatedCString.cpp: Added.
     131        * kwq/DeprecatedCString.h: Added.
     132        * kwq/DeprecatedPtrQueue.h: Added.
     133        * kwq/FileButton.h: Added.
     134        * kwq/FileButton.mm: Added.
     135        * kwq/FormDataMac.mm: Added.
     136        * kwq/KWQCString.cpp: Removed.
     137        * kwq/KWQCString.h: Removed.
     138        * kwq/KWQComboBox.h: Removed.
     139        * kwq/KWQComboBox.mm: Removed.
     140        * kwq/KWQEditCommand.h: Removed.
     141        * kwq/KWQEditCommand.mm: Removed.
     142        * kwq/KWQFileButton.h: Removed.
     143        * kwq/KWQFileButton.mm: Removed.
     144        * kwq/KWQFormData.h: Removed.
     145        * kwq/KWQFormData.mm: Removed.
     146        * kwq/KWQKHTMLSettings.h: Removed.
     147        * kwq/KWQKIOGlobal.h: Removed.
     148        * kwq/KWQKSSLKeyGen.h: Removed.
     149        * kwq/KWQKSSLKeyGen.mm: Removed.
     150        * kwq/KWQLineEdit.h: Removed.
     151        * kwq/KWQLineEdit.mm: Removed.
     152        * kwq/KWQListBox.h: Removed.
     153        * kwq/KWQListBox.mm: Removed.
     154        * kwq/KWQLoader.h: Removed.
     155        * kwq/KWQLoader.mm: Removed.
     156        * kwq/KWQPageState.h: Removed.
     157        * kwq/KWQPageState.mm: Removed.
     158        * kwq/KWQPtrQueue.h: Removed.
     159        * kwq/KWQResourceLoader.h: Removed.
     160        * kwq/KWQResourceLoader.mm: Removed.
     161        * kwq/KWQScrollBar.h: Removed.
     162        * kwq/KWQScrollBar.mm: Removed.
     163        * kwq/KWQSlider.h: Removed.
     164        * kwq/KWQSlider.mm: Removed.
     165        * kwq/KWQTextEdit.h: Removed.
     166        * kwq/KWQTextEdit.mm: Removed.
     167        * kwq/KWQTextStream.cpp: Removed.
     168        * kwq/KWQTextStream.h: Removed.
     169        * kwq/KWQWMatrix.cpp: Removed.
     170        * kwq/KWQWMatrix.h: Removed.
     171        * kwq/ListBox.h: Added.
     172        * kwq/ListBox.mm: Added.
     173        * kwq/LoaderFunctions.h: Added.
     174        * kwq/LoaderFunctions.mm: Added.
     175        * kwq/PopUpButton.h: Added.
     176        * kwq/PopUpButton.mm: Added.
     177        * kwq/SSLKeyGenerator.h: Added.
     178        * kwq/SSLKeyGenerator.mm: Added.
     179        * kwq/Settings.h: Added.
     180        * kwq/TextBox.h: Added.
     181        * kwq/TextBox.mm: Added.
     182        * kwq/TextField.h: Added.
     183        * kwq/TextField.mm: Added.
     184        * kwq/TextStream.cpp: Added.
     185        * kwq/TextStream.h: Added.
     186        * kwq/WebCoreEditCommand.h: Added.
     187        * kwq/WebCoreEditCommand.mm: Added.
     188        * kwq/WebCorePageState.h: Added.
     189        * kwq/WebCorePageState.mm: Added.
     190        * kwq/WebCoreResourceLoaderImp.h: Added.
     191        * kwq/WebCoreResourceLoaderImp.mm: Added.
     192        * kwq/WebCoreScrollBar.h: Added.
     193        * kwq/WebCoreScrollBar.mm: Added.
     194        * kwq/WebCoreSlider.h: Added.
     195        * kwq/WebCoreSlider.mm: Added.
     196        * loader/Cache.h:
     197        * loader/CachedCSSStyleSheet.cpp:
     198        * loader/CachedImage.cpp:
     199        * loader/CachedObject.h:
     200        * loader/CachedObjectClientWalker.h:
     201        * loader/CachedResource.h:
     202        * loader/CachedResourceClientWalker.h:
     203        * loader/CachedScript.h:
     204        * loader/CachedXBLDocument.h:
     205        * loader/Decoder.h:
     206        * loader/DocLoader.cpp:
     207        * loader/DocLoader.h:
     208        * loader/FormData.h:
     209        * loader/ImageDocument.cpp:
     210        * loader/PluginDocument.cpp:
     211        * loader/TextDocument.cpp:
     212        * loader/loader.cpp:
     213        * loader/loader.h:
     214        * page/Frame.cpp:
     215        * page/Frame.h:
     216        * page/FramePrivate.h:
     217        * page/Page.cpp:
     218        * page/Page.h:
     219        * platform/DeprecatedPtrList.h:
     220        * platform/DeprecatedPtrListImpl.cpp:
     221        * platform/DeprecatedPtrListImpl.h:
     222        * platform/DeprecatedString.cpp:
     223        * platform/DeprecatedString.h:
     224        * platform/DeprecatedStringList.cpp:
     225        * platform/DeprecatedStringList.h:
     226        * platform/DeprecatedValueList.h:
     227        * platform/DeprecatedValueListImpl.cpp:
     228        * platform/DeprecatedValueListImpl.h:
     229        * platform/FloatSize.h:
     230        * platform/Font.cpp:
     231        * platform/KURL.cpp:
     232        * platform/RegularExpression.cpp:
     233        * platform/RegularExpression.h:
     234        * platform/SegmentedString.h:
     235        * platform/StreamingTextDecoder.cpp:
     236        * platform/String.cpp:
     237        * platform/StringImpl.cpp:
     238        * platform/TextEncoding.cpp:
     239        * platform/TransferJob.cpp:
     240        * platform/TransferJob.h:
     241        * platform/TransferJobInternal.h:
     242        * platform/gdk/FrameGdk.cpp:
     243        * platform/gdk/TemporaryLinkStubs.cpp:
     244        * platform/mac/ClipboardMac.h:
     245        * platform/mac/ClipboardMac.mm:
     246        * platform/mac/CursorMac.mm:
     247        * platform/mac/DeprecatedStringMac.mm: Added.
     248        * platform/mac/FontCacheMac.mm:
     249        * platform/mac/FontMac.mm:
     250        * platform/mac/FoundationExtras.h:
     251        * platform/mac/ImageMac.mm:
     252        * platform/mac/KURLMac.mm:
     253        * platform/mac/MouseEventMac.mm: Removed.
     254        * platform/mac/QStringListMac.mm: Removed.
     255        * platform/mac/QStringMac.mm: Removed.
     256        * platform/mac/TransferJobMac.mm:
     257        * platform/mac/WebCoreTextArea.h:
     258        * platform/mac/WebCoreTextArea.mm:
     259        * platform/mac/WebCoreTextField.h:
     260        * platform/mac/WebCoreTextField.mm:
     261        * platform/mac/WidgetMac.mm:
     262        * platform/win/TemporaryLinkStubs.cpp:
     263        * rendering/DataRef.h:
     264        * rendering/DeprecatedRenderSelect.cpp:
     265        * rendering/DeprecatedRenderSelect.h:
     266        * rendering/DeprecatedSlider.cpp:
     267        * rendering/InlineFlowBox.cpp:
     268        * rendering/RenderApplet.cpp:
     269        * rendering/RenderBlock.cpp:
     270        * rendering/RenderBlock.h:
     271        * rendering/RenderContainer.cpp:
     272        * rendering/RenderFileButton.cpp:
     273        * rendering/RenderFlexibleBox.cpp:
     274        * rendering/RenderFlow.cpp:
     275        * rendering/RenderFormElement.cpp:
     276        * rendering/RenderFrameSet.cpp:
     277        * rendering/RenderFrameSet.h:
     278        * rendering/RenderImage.cpp:
     279        * rendering/RenderInline.cpp:
     280        * rendering/RenderLayer.cpp:
     281        * rendering/RenderLayer.h:
     282        * rendering/RenderLineEdit.cpp:
     283        * rendering/RenderListItem.cpp:
     284        * rendering/RenderListMarker.cpp:
     285        * rendering/RenderObject.cpp:
     286        * rendering/RenderObject.h:
     287        * rendering/RenderPartObject.cpp:
     288        * rendering/RenderReplaced.cpp:
     289        * rendering/RenderStyle.cpp: Added.
     290        * rendering/RenderStyle.h: Added.
     291        * rendering/RenderTable.cpp:
     292        * rendering/RenderTable.h:
     293        * rendering/RenderTableCell.cpp:
     294        * rendering/RenderTableCell.h:
     295        * rendering/RenderTableCol.cpp:
     296        * rendering/RenderTableCol.h:
     297        * rendering/RenderTableRow.cpp:
     298        * rendering/RenderTableSection.cpp:
     299        * rendering/RenderTableSection.h:
     300        * rendering/RenderText.cpp:
     301        * rendering/RenderText.h:
     302        * rendering/RenderTextArea.cpp:
     303        * rendering/RenderTextControl.cpp: Added.
     304        * rendering/RenderTextControl.h: Added.
     305        * rendering/RenderTextField.cpp: Removed.
     306        * rendering/RenderTextField.h: Removed.
     307        * rendering/RenderTheme.cpp:
     308        * rendering/RenderThemeMac.mm:
     309        * rendering/RenderTreeAsText.cpp:
     310        * rendering/RenderTreeAsText.h:
     311        * rendering/RenderView.cpp:
     312        * rendering/RenderWidget.cpp:
     313        * rendering/bidi.cpp:
     314        * rendering/render_style.cpp: Removed.
     315        * rendering/render_style.h: Removed.
     316        * xml/XSLStyleSheet.cpp:
     317        * xml/XSLTProcessor.cpp:
     318        * xml/xmlhttprequest.cpp:
     319        * xpath/impl/XPathParser.cpp:
     320
    13212006-07-09  Rob Buis  <buis@kde.org>
    2322

  • trunk/WebCore/WebCore+SVG/DOMList.h

    r13858 r15253  
    118118
    119119    private:
    120         Q3PtrList<T> m_impl;
     120        DeprecatedPtrList<T> m_impl;
    121121    };
    122122};

  • trunk/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj

    r15230 r15253  
    160160                        </File>
    161161                        <File
    162                                 RelativePath="..\..\kwq\KWQComboBox.h"
    163                                 >
    164                         </File>
    165                         <File
    166                                 RelativePath="..\..\kwq\KWQCString.cpp"
    167                                 >
    168                         </File>
    169                         <File
    170                                 RelativePath="..\..\kwq\KWQCString.h"
    171                                 >
    172                         </File>
    173                         <File
    174                                 RelativePath="..\..\kwq\KWQEditCommand.h"
    175                                 >
    176                         </File>
    177                         <File
    178                                 RelativePath="..\..\kwq\KWQFileButton.h"
    179                                 >
    180                         </File>
    181                         <File
    182                                 RelativePath="..\..\kwq\KWQFormData.h"
    183                                 >
    184                         </File>
    185                         <File
    186                                 RelativePath="..\..\kwq\KWQKHTMLSettings.h"
    187                                 >
    188                         </File>
    189                         <File
    190                                 RelativePath="..\..\kwq\KWQKSSLKeyGen.h"
     162                                RelativePath="..\..\kwq\PopUpButton.h"
     163                                >
     164                        </File>
     165                        <File
     166                                RelativePath="..\..\kwq\DeprecatedCString.cpp"
     167                                >
     168                        </File>
     169                        <File
     170                                RelativePath="..\..\kwq\DeprecatedCString.h"
     171                                >
     172                        </File>
     173                        <File
     174                                RelativePath="..\..\kwq\WebCoreEditCommand.h"
     175                                >
     176                        </File>
     177                        <File
     178                                RelativePath="..\..\kwq\FileButton.h"
     179                                >
     180                        </File>
     181                        <File
     182                                RelativePath="..\..\kwq\FormDataMac.h"
     183                                >
     184                        </File>
     185                        <File
     186                                RelativePath="..\..\kwq\Settings.h"
     187                                >
     188                        </File>
     189                        <File
     190                                RelativePath="..\..\kwq\SSLKeyGenerator.h"
    191191                                >
    192192                        </File>
    … …  
    196196                        </File>
    197197                        <File
    198                                 RelativePath="..\..\kwq\KWQLineEdit.h"
    199                                 >
    200                         </File>
    201                         <File
    202                                 RelativePath="..\..\kwq\KWQListBox.h"
    203                                 >
    204                         </File>
    205                         <File
    206                                 RelativePath="..\..\kwq\KWQLoader.h"
    207                                 >
    208                         </File>
    209                         <File
    210                                 RelativePath="..\..\kwq\KWQPageState.h"
    211                                 >
    212                         </File>
    213                         <File
    214                                 RelativePath="..\..\kwq\KWQPtrQueue.h"
    215                                 >
    216                         </File>
    217                         <File
    218                                 RelativePath="..\..\kwq\KWQResourceLoader.h"
    219                                 >
    220                         </File>
    221                         <File
    222                                 RelativePath="..\..\kwq\KWQScrollBar.h"
    223                                 >
    224                         </File>
    225                         <File
    226                                 RelativePath="..\..\kwq\KWQSlider.h"
    227                                 >
    228                         </File>
    229                         <File
    230                                 RelativePath="..\..\kwq\KWQTextEdit.h"
    231                                 >
    232                         </File>
    233                         <File
    234                                 RelativePath="..\..\kwq\KWQTextStream.cpp"
    235                                 >
    236                         </File>
    237                         <File
    238                                 RelativePath="..\..\kwq\KWQTextStream.h"
     198                                RelativePath="..\..\kwq\TextField.h"
     199                                >
     200                        </File>
     201                        <File
     202                                RelativePath="..\..\kwq\ListBox.h"
     203                                >
     204                        </File>
     205                        <File
     206                                RelativePath="..\..\kwq\LoaderFunctions.h"
     207                                >
     208                        </File>
     209                        <File
     210                                RelativePath="..\..\kwq\WebCorePageState.h"
     211                                >
     212                        </File>
     213                        <File
     214                                RelativePath="..\..\kwq\DeprecatedPtrQueue.h"
     215                                >
     216                        </File>
     217                        <File
     218                                RelativePath="..\..\kwq\WebCoreResourceLoaderImp.h"
     219                                >
     220                        </File>
     221                        <File
     222                                RelativePath="..\..\kwq\WebCoreScrollBar.h"
     223                                >
     224                        </File>
     225                        <File
     226                                RelativePath="..\..\kwq\WebCoreSlider.h"
     227                                >
     228                        </File>
     229                        <File
     230                                RelativePath="..\..\kwq\TextBox.h"
     231                                >
     232                        </File>
     233                        <File
     234                                RelativePath="..\..\kwq\TextStream.cpp"
     235                                >
     236                        </File>
     237                        <File
     238                                RelativePath="..\..\kwq\TextStream.h"
    239239                                >
    240240                        </File>
    … …  
    244244                        </File>
    245245                        <File
    246                                 RelativePath="..\..\kwq\KWQWMatrix.h"
     246                                RelativePath="..\..\kwq\AffineTransform.h"
    247247                                >
    248248                        </File>
    … …  
    29162916                        </File>
    29172917                        <File
    2918                                 RelativePath="..\..\rendering\render_style.cpp"
    2919                                 >
    2920                         </File>
    2921                         <File
    2922                                 RelativePath="..\..\rendering\render_style.h"
     2918                                RelativePath="..\..\rendering\RenderStyle.cpp"
     2919                                >
     2920                        </File>
     2921                        <File
     2922                                RelativePath="..\..\rendering\RenderStyle.h"
    29232923                                >
    29242924                        </File>
    … …  
    32243224                        </File>
    32253225                        <File
    3226                                 RelativePath="..\..\rendering\RenderTextField.cpp"
    3227                                 >
    3228                         </File>
    3229                         <File
    3230                                 RelativePath="..\..\rendering\RenderTextField.h"
     3226                                RelativePath="..\..\rendering\RenderTextControl.cpp"
     3227                                >
     3228                        </File>
     3229                        <File
     3230                                RelativePath="..\..\rendering\RenderTextControl.h"
    32313231                                >
    32323232                        </File>
    … …  
    38723872                        </File>
    38733873                        <File
    3874                                 RelativePath="..\..\dom\xml_tokenizer.cpp"
    3875                                 >
    3876                         </File>
    3877                         <File
    3878                                 RelativePath="..\..\dom\xml_tokenizer.h"
     3874                                RelativePath="..\..\dom\XMLTokenizer.cpp"
     3875                                >
     3876                        </File>
     3877                        <File
     3878                                RelativePath="..\..\dom\XMLTokenizer.h"
    38793879                                >
    38803880                        </File>

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r15239 r15253  
    188188                651B4D8509AC83370029F1EF /* DeprecatedStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */; };
    189189                651B4D8609AC83370029F1EF /* DeprecatedStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 651B4D8409AC83370029F1EF /* DeprecatedStringList.h */; };
    190                 651B4D8F09AC859F0029F1EF /* QStringListMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8E09AC859F0029F1EF /* QStringListMac.mm */; };
     190                651B4D8F09AC859F0029F1EF /* DeprecatedStringListMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */; };
    191191                6522BCDF09C9DAA800C9BA7A /* ResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 6522BCDE09C9DAA800C9BA7A /* ResourceRequest.h */; };
    192192                6545F67009B82FED0013006F /* TransferJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6545F66C09B82FED0013006F /* TransferJob.cpp */; };
    … …  
    250250                6582A16209999D6D00BEEB6D /* ScreenMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6582A15409999D6D00BEEB6D /* ScreenMac.mm */; };
    251251                6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */; };
    252                 6582A17809999EA000BEEB6D /* QStringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6582A17709999EA000BEEB6D /* QStringMac.mm */; };
     252                6582A17809999EA000BEEB6D /* DeprecatedStringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */; };
    253253                65901A4409FC6039005BD752 /* WebCoreStringTruncator.h in Headers */ = {isa = PBXBuildFile; fileRef = 65901A4209FC6039005BD752 /* WebCoreStringTruncator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    254254                65901A4509FC6039005BD752 /* WebCoreStringTruncator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65901A4309FC6039005BD752 /* WebCoreStringTruncator.mm */; };
    … …  
    458458                935C476D09AC4D6300A6AAB4 /* FoundationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476C09AC4D6300A6AAB4 /* FoundationExtras.h */; };
    459459                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */; };
    460                 935C477109AC4D7300A6AAB4 /* MouseEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476F09AC4D7300A6AAB4 /* MouseEventMac.mm */; };
     460                935C477109AC4D7300A6AAB4 /* PlatformMouseEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */; };
    461461                935C477309AC4D7700A6AAB4 /* WheelEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C477209AC4D7700A6AAB4 /* WheelEventMac.mm */; };
    462462                935C477509AC4D8E00A6AAB4 /* GapRects.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C477409AC4D8D00A6AAB4 /* GapRects.h */; };
    … …  
    536536                93F198F608245E59001E9ABC /* Decoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D27902DE43D7018635CA /* Decoder.h */; };
    537537                93F1991808245E59001E9ABC /* Range.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30402DE4476018635CA /* Range.h */; };
    538                 93F1992108245E59001E9ABC /* xml_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30A02DE4476018635CA /* xml_tokenizer.h */; };
    539                 93F1992908245E59001E9ABC /* KWQCString.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868302DE3B8601EA4122 /* KWQCString.h */; };
    540                 93F1992E08245E59001E9ABC /* KWQComboBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868202DE3B8601EA4122 /* KWQComboBox.h */; };
     538                93F1992108245E59001E9ABC /* XMLTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30A02DE4476018635CA /* XMLTokenizer.h */; };
     539                93F1992908245E59001E9ABC /* DeprecatedCString.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868302DE3B8601EA4122 /* DeprecatedCString.h */; };
     540                93F1992E08245E59001E9ABC /* PopUpButton.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868202DE3B8601EA4122 /* PopUpButton.h */; };
    541541                93F1992F08245E59001E9ABC /* Cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868402DE3B8601EA4122 /* Cursor.h */; };
    542                 93F1993908245E59001E9ABC /* KWQFileButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF7D4033BD43C008635CE /* KWQFileButton.h */; };
    543                 93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */; };
    544                 93F1995008245E59001E9ABC /* KWQKIOGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */; };
     542                93F1993908245E59001E9ABC /* FileButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF7D4033BD43C008635CE /* FileButton.h */; };
     543                93F1994F08245E59001E9ABC /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* Settings.h */; };
     544                93F1995008245E59001E9ABC /* CacheControl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* CacheControl.h */; };
    545545                93F1995408245E59001E9ABC /* JavaAppletWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864502DE3A7701EA4122 /* JavaAppletWidget.h */; };
    546                 93F1996308245E59001E9ABC /* KWQKSSLKeyGen.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */; };
    547                 93F1996B08245E59001E9ABC /* KWQLineEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869802DE3B8601EA4122 /* KWQLineEdit.h */; };
    548                 93F1996C08245E59001E9ABC /* KWQListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851302DE375901EA4122 /* KWQListBox.h */; };
     546                93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */; };
     547                93F1996B08245E59001E9ABC /* TextField.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869802DE3B8601EA4122 /* TextField.h */; };
     548                93F1996C08245E59001E9ABC /* ListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851302DE375901EA4122 /* ListBox.h */; };
    549549                93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */; };
    550                 93F1996E08245E59001E9ABC /* KWQLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851702DE375901EA4122 /* KWQLoader.h */; };
    551                 93F1997708245E59001E9ABC /* KWQPageState.h in Headers */ = {isa = PBXBuildFile; fileRef = 9394E0A403AA5BBE008635CE /* KWQPageState.h */; };
     550                93F1996E08245E59001E9ABC /* LoaderFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851702DE375901EA4122 /* LoaderFunctions.h */; };
     551                93F1997708245E59001E9ABC /* WebCorePageState.h in Headers */ = {isa = PBXBuildFile; fileRef = 9394E0A403AA5BBE008635CE /* WebCorePageState.h */; };
    552552                93F1998208245E59001E9ABC /* DeprecatedPtrList.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */; };
    553                 93F1998308245E59001E9ABC /* KWQPtrQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */; };
     553                93F1998308245E59001E9ABC /* DeprecatedPtrQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */; };
    554554                93F1998A08245E59001E9ABC /* RegularExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786B302DE3B8601EA4122 /* RegularExpression.h */; };
    555555                93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */ = {isa = PBXBuildFile; fileRef = 93955A4103D72932008635CE /* RenderTreeAsText.h */; };
    556                 93F1998D08245E59001E9ABC /* KWQResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 93386B90037045B3008635CE /* KWQResourceLoader.h */; };
     556                93F1998D08245E59001E9ABC /* WebCoreResourceLoaderImp.h in Headers */ = {isa = PBXBuildFile; fileRef = 93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */; };
    557557                93F1999708245E59001E9ABC /* WebCoreTextArea.h in Headers */ = {isa = PBXBuildFile; fileRef = F587853502DE375901EA4122 /* WebCoreTextArea.h */; };
    558                 93F1999908245E59001E9ABC /* KWQTextEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */; };
     558                93F1999908245E59001E9ABC /* TextBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BE02DE3B8601EA4122 /* TextBox.h */; };
    559559                93F1999A08245E59001E9ABC /* WebCoreTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851B02DE375901EA4122 /* WebCoreTextField.h */; };
    560                 93F1999B08245E59001E9ABC /* KWQTextStream.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BF02DE3B8601EA4122 /* KWQTextStream.h */; };
     560                93F1999B08245E59001E9ABC /* TextStream.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BF02DE3B8601EA4122 /* TextStream.h */; };
    561561                93F1999D08245E59001E9ABC /* DeprecatedValueList.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786C202DE3B8601EA4122 /* DeprecatedValueList.h */; };
    562562                93F1999E08245E59001E9ABC /* DeprecatedValueListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */; };
    … …  
    569569                93F199AF08245E59001E9ABC /* WebCoreSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F565AE8502ECA583018635CA /* WebCoreSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
    570570                93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855402DE375901EA4122 /* WebCoreViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
    571                 93F199B808245E59001E9ABC /* KWQScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B2AF80450824100A8000F /* KWQScrollBar.h */; };
     571                93F199B808245E59001E9ABC /* WebCoreScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */; };
    572572                93F199BB08245E59001E9ABC /* WebCoreKeyboardAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = BE983D95052A2E0A00892D85 /* WebCoreKeyboardAccess.h */; settings = {ATTRIBUTES = (Private, ); }; };
    573573                93F199BC08245E59001E9ABC /* WebCoreAXObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */; };
    … …  
    576576                93F199C208245E59001E9ABC /* WebCoreKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    577577                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3B364705C9D5E200E42902 /* AtomicStringList.h */; };
    578                 93F199D508245E59001E9ABC /* KWQEditCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF7EEA005FF8F0D009717EE /* KWQEditCommand.h */; };
     578                93F199D508245E59001E9ABC /* WebCoreEditCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */; };
    579579                93F199DE08245E59001E9ABC /* Position.h in Headers */ = {isa = PBXBuildFile; fileRef = BE91FC8B06133666005E3790 /* Position.h */; };
    580                 93F199E008245E59001E9ABC /* KWQSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = BC86FB8D061F5C23006BB822 /* KWQSlider.h */; };
     580                93F199E008245E59001E9ABC /* WebCoreSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */; };
    581581                93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */; };
    582582                93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D90660B0665D937006B6F1A /* ClipboardMac.h */; };
    … …  
    584584                93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06F24C06D18A7E004A6FA3 /* XSLTProcessor.h */; };
    585585                93F199EE08245E59001E9ABC /* FormData.h in Headers */ = {isa = PBXBuildFile; fileRef = 93ABCE5E06E1A42E0085925B /* FormData.h */; };
    586                 93F199EF08245E59001E9ABC /* KWQFormData.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B641F206E28C5C0055F610 /* KWQFormData.h */; };
     586                93F199EF08245E59001E9ABC /* FormDataMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B641F206E28C5C0055F610 /* FormDataMac.h */; };
    587587                93F199F008245E59001E9ABC /* WebCoreView.h in Headers */ = {isa = PBXBuildFile; fileRef = BE855F7F0701E83500239769 /* WebCoreView.h */; settings = {ATTRIBUTES = (Private, ); }; };
    588588                93F199F108245E59001E9ABC /* WebDashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 5150C2A10702629000AF642C /* WebDashboardRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    599599                93F19A0A08245E59001E9ABC /* waitCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 84C0FA2D052B966D000440A1 /* waitCursor.tiff */; };
    600600                93F19A0B08245E59001E9ABC /* westResizeCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 84C0FA2E052B966D000440A1 /* westResizeCursor.tiff */; };
    601                 93F19A1708245E59001E9ABC /* KWQComboBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784D202DE375901EA4122 /* KWQComboBox.mm */; };
    602                 93F19A1808245E59001E9ABC /* KWQCString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784D502DE375901EA4122 /* KWQCString.cpp */; };
     601                93F19A1708245E59001E9ABC /* PopUpButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784D202DE375901EA4122 /* PopUpButton.mm */; };
     602                93F19A1808245E59001E9ABC /* DeprecatedCString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784D502DE375901EA4122 /* DeprecatedCString.cpp */; };
    603603                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* CursorMac.mm */; };
    604604                93F19A2E08245E59001E9ABC /* JavaAppletWidget.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784FF02DE375901EA4122 /* JavaAppletWidget.mm */; };
    605                 93F19A3108245E59001E9ABC /* KWQLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850302DE375901EA4122 /* KWQLoader.mm */; };
    606                 93F19A3A08245E59001E9ABC /* KWQLineEdit.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* KWQLineEdit.mm */; };
    607                 93F19A3B08245E59001E9ABC /* KWQListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* KWQListBox.mm */; };
     605                93F19A3108245E59001E9ABC /* LoaderFunctions.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850302DE375901EA4122 /* LoaderFunctions.mm */; };
     606                93F19A3A08245E59001E9ABC /* TextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* TextField.mm */; };
     607                93F19A3B08245E59001E9ABC /* ListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* ListBox.mm */; };
    608608                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */; };
    609609                93F19A3F08245E59001E9ABC /* WebCoreTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851C02DE375901EA4122 /* WebCoreTextField.mm */; };
    610610                93F19A4A08245E59001E9ABC /* RegularExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852B02DE375901EA4122 /* RegularExpression.cpp */; };
    611611                93F19A5108245E59001E9ABC /* WebCoreTextArea.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853602DE375901EA4122 /* WebCoreTextArea.mm */; };
    612                 93F19A5308245E59001E9ABC /* KWQTextEdit.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853802DE375901EA4122 /* KWQTextEdit.mm */; };
    613                 93F19A5408245E59001E9ABC /* KWQTextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853902DE375901EA4122 /* KWQTextStream.cpp */; };
     612                93F19A5308245E59001E9ABC /* TextBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853802DE375901EA4122 /* TextBox.mm */; };
     613                93F19A5408245E59001E9ABC /* TextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853902DE375901EA4122 /* TextStream.cpp */; };
    614614                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */; };
    615615                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F587855502DE375901EA4122 /* WebCoreViewFactory.m */; };
    … …  
    620620                93F19A9D08245E59001E9ABC /* Decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D27802DE43D7018635CA /* Decoder.cpp */; };
    621621                93F19AB908245E59001E9ABC /* Range.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30302DE4476018635CA /* Range.cpp */; };
    622                 93F19ABC08245E59001E9ABC /* xml_tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30902DE4476018635CA /* xml_tokenizer.cpp */; };
     622                93F19ABC08245E59001E9ABC /* XMLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30902DE4476018635CA /* XMLTokenizer.cpp */; };
    623623                93F19ABE08245E59001E9ABC /* WebCoreCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B2A4FD02E2220F018635CB /* WebCoreCache.mm */; };
    624624                93F19ABF08245E59001E9ABC /* WebCoreJavaScript.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B2A52C02E22573018635CB /* WebCoreJavaScript.mm */; };
    … …  
    626626                93F19AC608245E59001E9ABC /* WebCoreEncodings.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56234E003026D7301629B47 /* WebCoreEncodings.mm */; };
    627627                93F19AC808245E59001E9ABC /* WebCoreHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = F5517DC3031AB56301A80180 /* WebCoreHistory.m */; };
    628                 93F19ACC08245E59001E9ABC /* KWQFileButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF7D5033BD43C008635CE /* KWQFileButton.mm */; };
    629                 93F19ACD08245E59001E9ABC /* KWQResourceLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93386B91037045B3008635CE /* KWQResourceLoader.mm */; };
    630                 93F19AD208245E59001E9ABC /* KWQPageState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9394E0A503AA5BBE008635CE /* KWQPageState.mm */; };
     628                93F19ACC08245E59001E9ABC /* FileButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF7D5033BD43C008635CE /* FileButton.mm */; };
     629                93F19ACD08245E59001E9ABC /* WebCoreResourceLoaderImp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */; };
     630                93F19AD208245E59001E9ABC /* WebCorePageState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9394E0A503AA5BBE008635CE /* WebCorePageState.mm */; };
    631631                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93955A4203D72932008635CE /* RenderTreeAsText.cpp */; };
    632                 93F19ADC08245E59001E9ABC /* KWQScrollBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7B2AF90450824100A8000F /* KWQScrollBar.mm */; };
     632                93F19ADC08245E59001E9ABC /* WebCoreScrollBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */; };
    633633                93F19ADF08245E59001E9ABC /* WebCoreAXObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */; };
    634634                93F19AE008245E59001E9ABC /* AccessibilityObjectCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5D052B59CC0017A6C1 /* AccessibilityObjectCache.mm */; };
    635635                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65F80697054D9F86008BF776 /* BlockExceptions.mm */; };
    636636                93F19AE508245E59001E9ABC /* WebCoreKeyGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */; };
    637                 93F19AE608245E59001E9ABC /* KWQKSSLKeyGen.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* KWQKSSLKeyGen.mm */; };
    638                 93F19AF708245E59001E9ABC /* KWQEditCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = BEF7EEA105FF8F0D009717EE /* KWQEditCommand.mm */; };
     637                93F19AE608245E59001E9ABC /* SSLKeyGenerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */; };
     638                93F19AF708245E59001E9ABC /* WebCoreEditCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */; };
    639639                93F19AF808245E59001E9ABC /* Position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE91FC8C06133666005E3790 /* Position.cpp */; };
    640                 93F19AFA08245E59001E9ABC /* KWQSlider.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC86FB8E061F5C23006BB822 /* KWQSlider.mm */; };
     640                93F19AFA08245E59001E9ABC /* WebCoreSlider.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */; };
    641641                93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */; };
    642642                93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* ClipboardMac.mm */; };
    … …  
    644644                93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24B06D18A7E004A6FA3 /* XSLTProcessor.cpp */; };
    645645                93F19B0508245E59001E9ABC /* FormData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93ABCE5D06E1A42E0085925B /* FormData.cpp */; };
    646                 93F19B0608245E59001E9ABC /* KWQFormData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B641F106E28C5C0055F610 /* KWQFormData.mm */; };
     646                93F19B0608245E59001E9ABC /* FormDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B641F106E28C5C0055F610 /* FormDataMac.mm */; };
    647647                93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE8560510701F91100239769 /* WebCoreView.m */; };
    648648                93F19B0808245E59001E9ABC /* WebDashboardRegion.m in Sources */ = {isa = PBXBuildFile; fileRef = 5150C2A50702629800AF642C /* WebDashboardRegion.m */; };
    … …  
    954954                A88AD3B70952486E001DD196 /* KCanvasPathQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = A8ABC99909445EC00013945F /* KCanvasPathQuartz.h */; };
    955955                A88AD3B80952486E001DD196 /* KCanvasPathQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8ABC99A09445EC00013945F /* KCanvasPathQuartz.mm */; };
    956                 A88AD3B90952486E001DD196 /* KCanvasContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB7A089701F800BA5114 /* KCanvasContainer.cpp */; };
    957                 A88AD3BA0952486E001DD196 /* KCanvasContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB7B089701F800BA5114 /* KCanvasContainer.h */; };
     956                A88AD3B90952486E001DD196 /* RenderSVGContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB7A089701F800BA5114 /* RenderSVGContainer.cpp */; };
     957                A88AD3BA0952486E001DD196 /* RenderSVGContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB7B089701F800BA5114 /* RenderSVGContainer.h */; };
    958958                A88AD3BB0952486E001DD196 /* KCanvasCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB7C089701F800BA5114 /* KCanvasCreator.cpp */; };
    959959                A88AD3BC0952486E001DD196 /* KCanvasCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB7D089701F800BA5114 /* KCanvasCreator.h */; };
    … …  
    13791379                A8EA800D0A19516E00A8EF5F /* StyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA80050A19516E00A8EF5F /* StyleSheet.cpp */; };
    13801380                A8EA800E0A19516E00A8EF5F /* MediaList.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA80060A19516E00A8EF5F /* MediaList.h */; };
    1381                 A8FD8B86087CB44C00DC3707 /* KWQWMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A85D7A8C0879EC64006A9172 /* KWQWMatrix.cpp */; };
    1382                 A8FD8B87087CB45700DC3707 /* KWQWMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */; };
     1381                A8FD8B86087CB44C00DC3707 /* AffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A85D7A8C0879EC64006A9172 /* AffineTransform.cpp */; };
     1382                A8FD8B87087CB45700DC3707 /* AffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = A85D7A8D0879EC64006A9172 /* AffineTransform.h */; };
    13831383                A8FEFB0A0979F472005839FD /* RenderForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = A8FEFB080979F472005839FD /* RenderForeignObject.h */; };
    13841384                A8FEFB0B0979F472005839FD /* RenderForeignObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8FEFB090979F472005839FD /* RenderForeignObject.cpp */; };
    … …  
    13901390                AB23A32809BBA7D00067CC53 /* BeforeTextInsertedEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = AB23A32609BBA7D00067CC53 /* BeforeTextInsertedEvent.h */; };
    13911391                AB4261D80A2F6C9700BDD17D /* missingImage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AB4261D70A2F6C9700BDD17D /* missingImage.tiff */; };
    1392                 AB67D1A8097F3AE300F9392E /* RenderTextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */; };
    1393                 AB67D1A9097F3AE300F9392E /* RenderTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextField.h */; };
     1392                AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */; };
     1393                AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextControl.h */; };
    13941394                ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */; };
    13951395                ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; };
    … …  
    15311531                BCEA487F097D93020094C9E4 /* RenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4840097D93020094C9E4 /* RenderObject.cpp */; };
    15321532                BCEA4880097D93020094C9E4 /* RenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4841097D93020094C9E4 /* RenderObject.h */; };
    1533                 BCEA4883097D93020094C9E4 /* render_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4844097D93020094C9E4 /* render_style.cpp */; };
    1534                 BCEA4884097D93020094C9E4 /* render_style.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4845097D93020094C9E4 /* render_style.h */; };
     1533                BCEA4883097D93020094C9E4 /* RenderStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4844097D93020094C9E4 /* RenderStyle.cpp */; };
     1534                BCEA4884097D93020094C9E4 /* RenderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4845097D93020094C9E4 /* RenderStyle.h */; };
    15351535                BCEA4887097D93020094C9E4 /* RenderThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4848097D93020094C9E4 /* RenderThemeMac.h */; };
    15361536                BCEA4888097D93020094C9E4 /* RenderThemeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4849097D93020094C9E4 /* RenderThemeMac.mm */; };
    … …  
    18241824                651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedStringList.cpp; sourceTree = "<group>"; };
    18251825                651B4D8409AC83370029F1EF /* DeprecatedStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedStringList.h; sourceTree = "<group>"; };
    1826                 651B4D8E09AC859F0029F1EF /* QStringListMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = QStringListMac.mm; sourceTree = "<group>"; };
     1826                651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DeprecatedStringListMac.mm; sourceTree = "<group>"; };
    18271827                6522BCDE09C9DAA800C9BA7A /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceRequest.h; sourceTree = "<group>"; };
    18281828                6545F66C09B82FED0013006F /* TransferJob.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TransferJob.cpp; sourceTree = "<group>"; };
    … …  
    19091909                6582A15409999D6D00BEEB6D /* ScreenMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScreenMac.mm; sourceTree = "<group>"; };
    19101910                6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SystemTimeMac.cpp; sourceTree = "<group>"; };
    1911                 6582A17709999EA000BEEB6D /* QStringMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = QStringMac.mm; sourceTree = "<group>"; };
     1911                6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DeprecatedStringMac.mm; sourceTree = "<group>"; };
    19121912                65901A4209FC6039005BD752 /* WebCoreStringTruncator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreStringTruncator.h; sourceTree = "<group>"; };
    19131913                65901A4309FC6039005BD752 /* WebCoreStringTruncator.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreStringTruncator.mm; sourceTree = "<group>"; };
    … …  
    19771977                84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    19781978                84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreKeyGenerator.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    1979                 84B2B24F056BF15F00D2B771 /* KWQKSSLKeyGen.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKSSLKeyGen.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     1979                84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SSLKeyGenerator.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    19801980                84C0FA24052B966D000440A1 /* eastResizeCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = eastResizeCursor.tiff; sourceTree = "<group>"; };
    19811981                84C0FA25052B966D000440A1 /* helpCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = helpCursor.tiff; sourceTree = "<group>"; };
    … …  
    21172117                93309EA0099EB78C0056E581 /* SharedTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedTimer.h; sourceTree = "<group>"; };
    21182118                93309EA1099EB78C0056E581 /* Timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timer.cpp; sourceTree = "<group>"; };
    2119                 93386B90037045B3008635CE /* KWQResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQResourceLoader.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    2120                 93386B91037045B3008635CE /* KWQResourceLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQResourceLoader.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2119                93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreResourceLoaderImp.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2120                93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreResourceLoaderImp.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    21212121                9352071709BD3BA500F2038D /* StaticConstructors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StaticConstructors.h; sourceTree = "<group>"; };
    21222122                9352071809BD3BA500F2038D /* TextBoundaries.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBoundaries.h; sourceTree = "<group>"; };
    … …  
    21422142                935C476C09AC4D6300A6AAB4 /* FoundationExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FoundationExtras.h; sourceTree = "<group>"; };
    21432143                935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KeyEventMac.mm; sourceTree = "<group>"; };
    2144                 935C476F09AC4D7300A6AAB4 /* MouseEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MouseEventMac.mm; sourceTree = "<group>"; };
     2144                935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformMouseEventMac.mm; sourceTree = "<group>"; };
    21452145                935C477209AC4D7700A6AAB4 /* WheelEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WheelEventMac.mm; sourceTree = "<group>"; };
    21462146                935C477409AC4D8D00A6AAB4 /* GapRects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GapRects.h; sourceTree = "<group>"; };
    … …  
    21612161                938E683B09F0BD7A008A48EC /* GraphicsTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsTypes.h; sourceTree = "<group>"; };
    21622162                938E685309F0BE04008A48EC /* GraphicsTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsTypes.cpp; sourceTree = "<group>"; };
    2163                 9394E0A403AA5BBE008635CE /* KWQPageState.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPageState.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    2164                 9394E0A503AA5BBE008635CE /* KWQPageState.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQPageState.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2163                9394E0A403AA5BBE008635CE /* WebCorePageState.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCorePageState.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2164                9394E0A503AA5BBE008635CE /* WebCorePageState.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCorePageState.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    21652165                93955A4103D72932008635CE /* RenderTreeAsText.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RenderTreeAsText.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    21662166                93955A4203D72932008635CE /* RenderTreeAsText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTreeAsText.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    21712171                93ABCE5D06E1A42E0085925B /* FormData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormData.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    21722172                93ABCE5E06E1A42E0085925B /* FormData.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FormData.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    2173                 93B641F106E28C5C0055F610 /* KWQFormData.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQFormData.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    2174                 93B641F206E28C5C0055F610 /* KWQFormData.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQFormData.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2173                93B641F106E28C5C0055F610 /* FormDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FormDataMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2174                93B641F206E28C5C0055F610 /* FormDataMac.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FormDataMac.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    21752175                93B70D3F09EB0C7C009D8468 /* JSDOMParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMParser.cpp; sourceTree = "<group>"; };
    21762176                93B70D4009EB0C7C009D8468 /* JSDOMParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMParser.h; sourceTree = "<group>"; };
    … …  
    22102210                93CA4CA209DF93FA00DF8677 /* svg.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg.css; sourceTree = "<group>"; };
    22112211                93CA4CA309DF93FA00DF8677 /* tokenizer.flex */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tokenizer.flex; sourceTree = "<group>"; };
    2212                 93CCF7D4033BD43C008635CE /* KWQFileButton.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQFileButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    2213                 93CCF7D5033BD43C008635CE /* KWQFileButton.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQFileButton.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2212                93CCF7D4033BD43C008635CE /* FileButton.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FileButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2213                93CCF7D5033BD43C008635CE /* FileButton.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileButton.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    22142214                93CD4FD70995F9EA007ECC97 /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicString.cpp; sourceTree = "<group>"; };
    22152215                93CD4FD80995F9EA007ECC97 /* AtomicString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicString.h; sourceTree = "<group>"; };
    … …  
    25702570                A833C9AA0A2CF68700D57664 /* SVGZoomEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = SVGZoomEvent.idl; path = svg/SVGZoomEvent.idl; sourceTree = "<group>"; };
    25712571                A85D7A2F0879EBA9006A9172 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
    2572                 A85D7A8C0879EC64006A9172 /* KWQWMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQWMatrix.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    2573                 A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQWMatrix.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2572                A85D7A8C0879EC64006A9172 /* AffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AffineTransform.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2573                A85D7A8D0879EC64006A9172 /* AffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AffineTransform.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    25742574                A86629C909DA2B47009633A5 /* JSUIEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSUIEvent.h; sourceTree = "<group>"; };
    25752575                A86629CA09DA2B47009633A5 /* JSUIEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSUIEvent.cpp; sourceTree = "<group>"; };
    … …  
    29232923                A8C0FB76089701F800BA5114 /* QuartzSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QuartzSupport.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    29242924                A8C0FB77089701F800BA5114 /* QuartzSupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuartzSupport.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    2925                 A8C0FB7A089701F800BA5114 /* KCanvasContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KCanvasContainer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    2926                 A8C0FB7B089701F800BA5114 /* KCanvasContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KCanvasContainer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2925                A8C0FB7A089701F800BA5114 /* RenderSVGContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGContainer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     2926                A8C0FB7B089701F800BA5114 /* RenderSVGContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGContainer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    29272927                A8C0FB7C089701F800BA5114 /* KCanvasCreator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KCanvasCreator.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    29282928                A8C0FB7D089701F800BA5114 /* KCanvasCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KCanvasCreator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    31313131                AB23A32609BBA7D00067CC53 /* BeforeTextInsertedEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BeforeTextInsertedEvent.h; sourceTree = "<group>"; };
    31323132                AB4261D70A2F6C9700BDD17D /* missingImage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = missingImage.tiff; sourceTree = "<group>"; };
    3133                 AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextField.cpp; sourceTree = "<group>"; };
    3134                 AB67D1A7097F3AE300F9392E /* RenderTextField.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderTextField.h; sourceTree = "<group>"; };
     3133                AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextControl.cpp; sourceTree = "<group>"; };
     3134                AB67D1A7097F3AE300F9392E /* RenderTextControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderTextControl.h; sourceTree = "<group>"; };
    31353135                ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMenuList.cpp; sourceTree = "<group>"; };
    31363136                ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderMenuList.h; sourceTree = "<group>"; };
    … …  
    31863186                BC73E3900978CED700EDFF8A /* FloatPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FloatPoint.cpp; sourceTree = "<group>"; };
    31873187                BC73E3910978CED700EDFF8A /* FloatPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FloatPoint.h; sourceTree = "<group>"; };
    3188                 BC7B2AF80450824100A8000F /* KWQScrollBar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQScrollBar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3189                 BC7B2AF90450824100A8000F /* KWQScrollBar.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQScrollBar.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3190                 BC86FB8D061F5C23006BB822 /* KWQSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQSlider.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3191                 BC86FB8E061F5C23006BB822 /* KWQSlider.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQSlider.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3188                BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreScrollBar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3189                BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreScrollBar.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3190                BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreSlider.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3191                BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSlider.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    31923192                BC92F1DB0A40AEA300AC0746 /* DeprecatedSlider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedSlider.cpp; sourceTree = "<group>"; };
    31933193                BC92F1DC0A40AEA300AC0746 /* DeprecatedSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedSlider.h; sourceTree = "<group>"; };
    … …  
    32863286                BCEA4840097D93020094C9E4 /* RenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderObject.cpp; sourceTree = "<group>"; };
    32873287                BCEA4841097D93020094C9E4 /* RenderObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderObject.h; sourceTree = "<group>"; };
    3288                 BCEA4844097D93020094C9E4 /* render_style.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = render_style.cpp; sourceTree = "<group>"; };
    3289                 BCEA4845097D93020094C9E4 /* render_style.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = render_style.h; sourceTree = "<group>"; };
     3288                BCEA4844097D93020094C9E4 /* RenderStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderStyle.cpp; sourceTree = "<group>"; };
     3289                BCEA4845097D93020094C9E4 /* RenderStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderStyle.h; sourceTree = "<group>"; };
    32903290                BCEA4848097D93020094C9E4 /* RenderThemeMac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderThemeMac.h; sourceTree = "<group>"; };
    32913291                BCEA4849097D93020094C9E4 /* RenderThemeMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = RenderThemeMac.mm; sourceTree = "<group>"; };
    … …  
    33203320                BE91FC8C06133666005E3790 /* Position.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Position.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33213321                BE983D95052A2E0A00892D85 /* WebCoreKeyboardAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreKeyboardAccess.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3322                 BEF7EEA005FF8F0D009717EE /* KWQEditCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQEditCommand.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3323                 BEF7EEA105FF8F0D009717EE /* KWQEditCommand.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQEditCommand.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3322                BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreEditCommand.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3323                BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreEditCommand.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33243324                C6D74AD309AA282E000B0A52 /* ModifySelectionListLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifySelectionListLevel.h; sourceTree = "<group>"; };
    33253325                C6D74AE309AA290A000B0A52 /* ModifySelectionListLevel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModifySelectionListLevel.cpp; sourceTree = "<group>"; };
    … …  
    33543354                F523D30302DE4476018635CA /* Range.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Range.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33553355                F523D30402DE4476018635CA /* Range.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Range.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3356                 F523D30902DE4476018635CA /* xml_tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_tokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3357                 F523D30A02DE4476018635CA /* xml_tokenizer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = xml_tokenizer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3356                F523D30902DE4476018635CA /* XMLTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3357                F523D30A02DE4476018635CA /* XMLTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = XMLTokenizer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33583358                F5517DC2031AB56301A80180 /* WebCoreHistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreHistory.h; sourceTree = "<group>"; };
    33593359                F5517DC3031AB56301A80180 /* WebCoreHistory.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebCoreHistory.m; sourceTree = "<group>"; };
    … …  
    33623362                F565AE8502ECA583018635CA /* WebCoreSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreSettings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33633363                F565AE8602ECA583018635CA /* WebCoreSettings.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSettings.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3364                 F58784D202DE375901EA4122 /* KWQComboBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQComboBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3365                 F58784D502DE375901EA4122 /* KWQCString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQCString.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3364                F58784D202DE375901EA4122 /* PopUpButton.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PopUpButton.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3365                F58784D502DE375901EA4122 /* DeprecatedCString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedCString.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33663366                F58784F002DE375901EA4122 /* CursorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CursorMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33673367                F58784FF02DE375901EA4122 /* JavaAppletWidget.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JavaAppletWidget.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3368                 F587850302DE375901EA4122 /* KWQLoader.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQLoader.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3369                 F587851202DE375901EA4122 /* KWQLineEdit.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQLineEdit.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3370                 F587851302DE375901EA4122 /* KWQListBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQListBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3371                 F587851402DE375901EA4122 /* KWQListBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQListBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3368                F587850302DE375901EA4122 /* LoaderFunctions.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoaderFunctions.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3369                F587851202DE375901EA4122 /* TextField.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextField.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3370                F587851302DE375901EA4122 /* ListBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ListBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3371                F587851402DE375901EA4122 /* ListBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ListBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33723372                F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33733373                F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedPtrListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3374                 F587851702DE375901EA4122 /* KWQLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQLoader.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3374                F587851702DE375901EA4122 /* LoaderFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = LoaderFunctions.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33753375                F587851B02DE375901EA4122 /* WebCoreTextField.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreTextField.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33763376                F587851C02DE375901EA4122 /* WebCoreTextField.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreTextField.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    33783378                F587853502DE375901EA4122 /* WebCoreTextArea.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreTextArea.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33793379                F587853602DE375901EA4122 /* WebCoreTextArea.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreTextArea.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3380                 F587853802DE375901EA4122 /* KWQTextEdit.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQTextEdit.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3381                 F587853902DE375901EA4122 /* KWQTextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQTextStream.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3380                F587853802DE375901EA4122 /* TextBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3381                F587853902DE375901EA4122 /* TextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextStream.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33823382                F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33833383                F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedValueListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    33863386                F587855402DE375901EA4122 /* WebCoreViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33873387                F587855502DE375901EA4122 /* WebCoreViewFactory.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreViewFactory.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3388                 F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLSettings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3388                F587863A02DE3A1401EA4122 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33893389                F587864502DE3A7701EA4122 /* JavaAppletWidget.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JavaAppletWidget.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3390                 F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKIOGlobal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3391                 F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKSSLKeyGen.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3392                 F587868202DE3B8601EA4122 /* KWQComboBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQComboBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3393                 F587868302DE3B8601EA4122 /* KWQCString.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQCString.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3390                F587864902DE3A9A01EA4122 /* CacheControl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = CacheControl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3391                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = SSLKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3392                F587868202DE3B8601EA4122 /* PopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = PopUpButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3393                F587868302DE3B8601EA4122 /* DeprecatedCString.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCString.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33943394                F587868402DE3B8601EA4122 /* Cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Cursor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3395                 F587869802DE3B8601EA4122 /* KWQLineEdit.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQLineEdit.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3395                F587869802DE3B8601EA4122 /* TextField.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TextField.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33963396                F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3397                 F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPtrQueue.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3397                F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrQueue.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    33983398                F58786B302DE3B8601EA4122 /* RegularExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegularExpression.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3399                 F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextEdit.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3400                 F58786BF02DE3B8601EA4122 /* KWQTextStream.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextStream.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3399                F58786BE02DE3B8601EA4122 /* TextBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TextBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     3400                F58786BF02DE3B8601EA4122 /* TextStream.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TextStream.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    34013401                F58786C202DE3B8601EA4122 /* DeprecatedValueList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    34023402                F58EF58E02DFDFB7018635CA /* WebCore.exp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.exports; path = WebCore.exp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    38553855                                935207BF09BD412000F2038D /* LocalizedStringsMac.mm */,
    38563856                                65F5382409B2B57500F3DC4A /* mac-encodings.txt */,
    3857                                 935C476F09AC4D7300A6AAB4 /* MouseEventMac.mm */,
     3857                                935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */,
    38583858                                6582A15209999D6D00BEEB6D /* PDFDocumentImage.h */,
    38593859                                6582A15309999D6D00BEEB6D /* PDFDocumentImage.mm */,
    38603860                                A82398A709B3ACF500B60641 /* PlugInInfoStoreMac.mm */,
    3861                                 651B4D8E09AC859F0029F1EF /* QStringListMac.mm */,
    3862                                 6582A17709999EA000BEEB6D /* QStringMac.mm */,
     3861                                651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */,
     3862                                6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */,
    38633863                                6582A15409999D6D00BEEB6D /* ScreenMac.mm */,
    38643864                                9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */,
    … …  
    47854785                        children = (
    47864786                                A8C0FB53089701F700BA5114 /* device */,
    4787                                 A8C0FB7A089701F800BA5114 /* KCanvasContainer.cpp */,
    4788                                 A8C0FB7B089701F800BA5114 /* KCanvasContainer.h */,
     4787                                A8C0FB7A089701F800BA5114 /* RenderSVGContainer.cpp */,
     4788                                A8C0FB7B089701F800BA5114 /* RenderSVGContainer.h */,
    47894789                                A8C0FB7C089701F800BA5114 /* KCanvasCreator.cpp */,
    47904790                                A8C0FB7D089701F800BA5114 /* KCanvasCreator.h */,
    … …  
    51725172                        isa = PBXGroup;
    51735173                        children = (
    5174                                 BEF7EEA005FF8F0D009717EE /* KWQEditCommand.h */,
    5175                                 BEF7EEA105FF8F0D009717EE /* KWQEditCommand.mm */,
    5176                                 93CCF7D4033BD43C008635CE /* KWQFileButton.h */,
    5177                                 93CCF7D5033BD43C008635CE /* KWQFileButton.mm */,
    5178                                 93B641F206E28C5C0055F610 /* KWQFormData.h */,
    5179                                 93B641F106E28C5C0055F610 /* KWQFormData.mm */,
    5180                                 F587851702DE375901EA4122 /* KWQLoader.h */,
    5181                                 F587850302DE375901EA4122 /* KWQLoader.mm */,
    5182                                 9394E0A403AA5BBE008635CE /* KWQPageState.h */,
    5183                                 9394E0A503AA5BBE008635CE /* KWQPageState.mm */,
    5184                                 93386B90037045B3008635CE /* KWQResourceLoader.h */,
    5185                                 93386B91037045B3008635CE /* KWQResourceLoader.mm */,
    5186                                 BC7B2AF80450824100A8000F /* KWQScrollBar.h */,
    5187                                 BC7B2AF90450824100A8000F /* KWQScrollBar.mm */,
     5174                                BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */,
     5175                                BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */,
     5176                                93CCF7D4033BD43C008635CE /* FileButton.h */,
     5177                                93CCF7D5033BD43C008635CE /* FileButton.mm */,
     5178                                93B641F206E28C5C0055F610 /* FormDataMac.h */,
     5179                                93B641F106E28C5C0055F610 /* FormDataMac.mm */,
     5180                                F587851702DE375901EA4122 /* LoaderFunctions.h */,
     5181                                F587850302DE375901EA4122 /* LoaderFunctions.mm */,
     5182                                9394E0A403AA5BBE008635CE /* WebCorePageState.h */,
     5183                                9394E0A503AA5BBE008635CE /* WebCorePageState.mm */,
     5184                                93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */,
     5185                                93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */,
     5186                                BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */,
     5187                                BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */,
    51885188                        );
    51895189                        name = other;
    … …  
    53295329                                A8EA7A4D0A191A5200A8EF5F /* ListMarkerBox.cpp */,
    53305330                                A8EA7A490A191A5200A8EF5F /* ListMarkerBox.h */,
    5331                                 BCEA4844097D93020094C9E4 /* render_style.cpp */,
    5332                                 BCEA4845097D93020094C9E4 /* render_style.h */,
     5331                                BCEA4844097D93020094C9E4 /* RenderStyle.cpp */,
     5332                                BCEA4845097D93020094C9E4 /* RenderStyle.h */,
    53335333                                BCEA481C097D93020094C9E4 /* RenderApplet.cpp */,
    53345334                                BCEA481D097D93020094C9E4 /* RenderApplet.h */,
    … …  
    54035403                                A8EA73B40A1900E300A8EF5F /* RenderTextArea.cpp */,
    54045404                                A8EA73BA0A1900E300A8EF5F /* RenderTextArea.h */,
    5405                                 AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */,
    5406                                 AB67D1A7097F3AE300F9392E /* RenderTextField.h */,
     5405                                AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */,
     5406                                AB67D1A7097F3AE300F9392E /* RenderTextControl.h */,
    54075407                                BCEA484E097D93020094C9E4 /* RenderTextFragment.cpp */,
    54085408                                BCEA484F097D93020094C9E4 /* RenderTextFragment.h */,
    … …  
    55515551                                85031B3B0A44EFC700F992E0 /* WheelEvent.h */,
    55525552                                93EEC1F709C2877700C515D1 /* WheelEvent.idl */,
    5553                                 F523D30902DE4476018635CA /* xml_tokenizer.cpp */,
    5554                                 F523D30A02DE4476018635CA /* xml_tokenizer.h */,
     5553                                F523D30902DE4476018635CA /* XMLTokenizer.cpp */,
     5554                                F523D30A02DE4476018635CA /* XMLTokenizer.h */,
    55555555                        );
    55565556                        path = dom;
    … …  
    55725572                        isa = PBXGroup;
    55735573                        children = (
    5574                                 F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */,
     5574                                F587863A02DE3A1401EA4122 /* Settings.h */,
    55755575                        );
    55765576                        name = khtml;
    … …  
    55805580                        isa = PBXGroup;
    55815581                        children = (
    5582                                 F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */,
    5583                                 F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */,
    5584                                 84B2B24F056BF15F00D2B771 /* KWQKSSLKeyGen.mm */,
     5582                                F587864902DE3A9A01EA4122 /* CacheControl.h */,
     5583                                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
     5584                                84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */,
    55855585                        );
    55865586                        name = kio;
    … …  
    55905590                        isa = PBXGroup;
    55915591                        children = (
    5592                                 F587868202DE3B8601EA4122 /* KWQComboBox.h */,
    5593                                 F58784D202DE375901EA4122 /* KWQComboBox.mm */,
    5594                                 F58784D502DE375901EA4122 /* KWQCString.cpp */,
    5595                                 F587868302DE3B8601EA4122 /* KWQCString.h */,
    5596                                 F587869802DE3B8601EA4122 /* KWQLineEdit.h */,
    5597                                 F587851202DE375901EA4122 /* KWQLineEdit.mm */,
    5598                                 F587851302DE375901EA4122 /* KWQListBox.h */,
    5599                                 F587851402DE375901EA4122 /* KWQListBox.mm */,
    5600                                 F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */,
    5601                                 BC86FB8D061F5C23006BB822 /* KWQSlider.h */,
    5602                                 BC86FB8E061F5C23006BB822 /* KWQSlider.mm */,
    5603                                 F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */,
    5604                                 F587853802DE375901EA4122 /* KWQTextEdit.mm */,
    5605                                 F587853902DE375901EA4122 /* KWQTextStream.cpp */,
    5606                                 F58786BF02DE3B8601EA4122 /* KWQTextStream.h */,
    5607                                 A85D7A8C0879EC64006A9172 /* KWQWMatrix.cpp */,
    5608                                 A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */,
     5592                                F587868202DE3B8601EA4122 /* PopUpButton.h */,
     5593                                F58784D202DE375901EA4122 /* PopUpButton.mm */,
     5594                                F58784D502DE375901EA4122 /* DeprecatedCString.cpp */,
     5595                                F587868302DE3B8601EA4122 /* DeprecatedCString.h */,
     5596                                F587869802DE3B8601EA4122 /* TextField.h */,
     5597                                F587851202DE375901EA4122 /* TextField.mm */,
     5598                                F587851302DE375901EA4122 /* ListBox.h */,
     5599                                F587851402DE375901EA4122 /* ListBox.mm */,
     5600                                F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */,
     5601                                BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */,
     5602                                BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */,
     5603                                F58786BE02DE3B8601EA4122 /* TextBox.h */,
     5604                                F587853802DE375901EA4122 /* TextBox.mm */,
     5605                                F587853902DE375901EA4122 /* TextStream.cpp */,
     5606                                F58786BF02DE3B8601EA4122 /* TextStream.h */,
     5607                                A85D7A8C0879EC64006A9172 /* AffineTransform.cpp */,
     5608                                A85D7A8D0879EC64006A9172 /* AffineTransform.h */,
    56095609                        );
    56105610                        name = qt;
    … …  
    56245624                                93F198F608245E59001E9ABC /* Decoder.h in Headers */,
    56255625                                93F1991808245E59001E9ABC /* Range.h in Headers */,
    5626                                 93F1992108245E59001E9ABC /* xml_tokenizer.h in Headers */,
    5627                                 93F1992908245E59001E9ABC /* KWQCString.h in Headers */,
    5628                                 93F1992E08245E59001E9ABC /* KWQComboBox.h in Headers */,
     5626                                93F1992108245E59001E9ABC /* XMLTokenizer.h in Headers */,
     5627                                93F1992908245E59001E9ABC /* DeprecatedCString.h in Headers */,
     5628                                93F1992E08245E59001E9ABC /* PopUpButton.h in Headers */,
    56295629                                93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
    5630                                 93F1993908245E59001E9ABC /* KWQFileButton.h in Headers */,
    5631                                 93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */,
    5632                                 93F1995008245E59001E9ABC /* KWQKIOGlobal.h in Headers */,
     5630                                93F1993908245E59001E9ABC /* FileButton.h in Headers */,
     5631                                93F1994F08245E59001E9ABC /* Settings.h in Headers */,
     5632                                93F1995008245E59001E9ABC /* CacheControl.h in Headers */,
    56335633                                93F1995408245E59001E9ABC /* JavaAppletWidget.h in Headers */,
    5634                                 93F1996308245E59001E9ABC /* KWQKSSLKeyGen.h in Headers */,
    5635                                 93F1996B08245E59001E9ABC /* KWQLineEdit.h in Headers */,
    5636                                 93F1996C08245E59001E9ABC /* KWQListBox.h in Headers */,
     5634                                93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */,
     5635                                93F1996B08245E59001E9ABC /* TextField.h in Headers */,
     5636                                93F1996C08245E59001E9ABC /* ListBox.h in Headers */,
    56375637                                93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */,
    5638                                 93F1996E08245E59001E9ABC /* KWQLoader.h in Headers */,
    5639                                 93F1997708245E59001E9ABC /* KWQPageState.h in Headers */,
     5638                                93F1996E08245E59001E9ABC /* LoaderFunctions.h in Headers */,
     5639                                93F1997708245E59001E9ABC /* WebCorePageState.h in Headers */,
    56405640                                93F1998208245E59001E9ABC /* DeprecatedPtrList.h in Headers */,
    5641                                 93F1998308245E59001E9ABC /* KWQPtrQueue.h in Headers */,
     5641                                93F1998308245E59001E9ABC /* DeprecatedPtrQueue.h in Headers */,
    56425642                                93F1998A08245E59001E9ABC /* RegularExpression.h in Headers */,
    56435643                                93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */,
    5644                                 93F1998D08245E59001E9ABC /* KWQResourceLoader.h in Headers */,
     5644                                93F1998D08245E59001E9ABC /* WebCoreResourceLoaderImp.h in Headers */,
    56455645                                93F1999708245E59001E9ABC /* WebCoreTextArea.h in Headers */,
    5646                                 93F1999908245E59001E9ABC /* KWQTextEdit.h in Headers */,
     5646                                93F1999908245E59001E9ABC /* TextBox.h in Headers */,
    56475647                                93F1999A08245E59001E9ABC /* WebCoreTextField.h in Headers */,
    5648                                 93F1999B08245E59001E9ABC /* KWQTextStream.h in Headers */,
     5648                                93F1999B08245E59001E9ABC /* TextStream.h in Headers */,
    56495649                                93F1999D08245E59001E9ABC /* DeprecatedValueList.h in Headers */,
    56505650                                93F1999E08245E59001E9ABC /* DeprecatedValueListImpl.h in Headers */,
    … …  
    56575657                                93F199AF08245E59001E9ABC /* WebCoreSettings.h in Headers */,
    56585658                                93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */,
    5659                                 93F199B808245E59001E9ABC /* KWQScrollBar.h in Headers */,
     5659                                93F199B808245E59001E9ABC /* WebCoreScrollBar.h in Headers */,
    56605660                                93F199BB08245E59001E9ABC /* WebCoreKeyboardAccess.h in Headers */,
    56615661                                93F199BC08245E59001E9ABC /* WebCoreAXObject.h in Headers */,
    … …  
    56645664                                93F199C208245E59001E9ABC /* WebCoreKeyGenerator.h in Headers */,
    56655665                                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */,
    5666                                 93F199D508245E59001E9ABC /* KWQEditCommand.h in Headers */,
     5666                                93F199D508245E59001E9ABC /* WebCoreEditCommand.h in Headers */,
    56675667                                93F199DE08245E59001E9ABC /* Position.h in Headers */,
    5668                                 93F199E008245E59001E9ABC /* KWQSlider.h in Headers */,
     5668                                93F199E008245E59001E9ABC /* WebCoreSlider.h in Headers */,
    56695669                                93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */,
    56705670                                93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */,
    … …  
    56725672                                93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */,
    56735673                                93F199EE08245E59001E9ABC /* FormData.h in Headers */,
    5674                                 93F199EF08245E59001E9ABC /* KWQFormData.h in Headers */,
     5674                                93F199EF08245E59001E9ABC /* FormDataMac.h in Headers */,
    56755675                                93F199F008245E59001E9ABC /* WebCoreView.h in Headers */,
    56765676                                93F199F108245E59001E9ABC /* WebDashboardRegion.h in Headers */,
    56775677                                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
    56785678                                BCEF3435087B563E00BBF833 /* HTMLElementFactory.h in Headers */,
    5679                                 A8FD8B87087CB45700DC3707 /* KWQWMatrix.h in Headers */,
     5679                                A8FD8B87087CB45700DC3707 /* AffineTransform.h in Headers */,
    56805680                                7E6FEED80898582300C44C3F /* WebCoreScriptDebugger.h in Headers */,
    56815681                                939885C408B7E3D100E707C4 /* EventNames.h in Headers */,
    … …  
    57035703                                A88AD3B50952486E001DD196 /* QuartzSupport.h in Headers */,
    57045704                                A88AD3B70952486E001DD196 /* KCanvasPathQuartz.h in Headers */,
    5705                                 A88AD3BA0952486E001DD196 /* KCanvasContainer.h in Headers */,
     5705                                A88AD3BA0952486E001DD196 /* RenderSVGContainer.h in Headers */,
    57065706                                A88AD3BC0952486E001DD196 /* KCanvasCreator.h in Headers */,
    57075707                                A88AD3BE0952486E001DD196 /* KCanvasFilters.h in Headers */,
    … …  
    59525952                                BCEA487A097D93020094C9E4 /* RenderLayer.h in Headers */,
    59535953                                BCEA4880097D93020094C9E4 /* RenderObject.h in Headers */,
    5954                                 BCEA4884097D93020094C9E4 /* render_style.h in Headers */,
     5954                                BCEA4884097D93020094C9E4 /* RenderStyle.h in Headers */,
    59555955                                BCEA4887097D93020094C9E4 /* RenderThemeMac.h in Headers */,
    59565956                                BCEA488A097D93020094C9E4 /* RenderTheme.h in Headers */,
    … …  
    59595959                                BCEA4944097F0F5C0094C9E4 /* BrowserExtension.h in Headers */,
    59605960                                BCEA4947097F0F770094C9E4 /* BrowserExtensionMac.h in Headers */,
    5961                                 AB67D1A9097F3AE300F9392E /* RenderTextField.h in Headers */,
     5961                                AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */,
    59625962                                A8DF3FCE097FA0FC0052981B /* HTMLFormCollection.h in Headers */,
    59635963                                A8DF3FD0097FA0FC0052981B /* HTMLCollection.h in Headers */,
    … …  
    65406540                        buildActionMask = 2147483647;
    65416541                        files = (
    6542                                 93F19A1708245E59001E9ABC /* KWQComboBox.mm in Sources */,
    6543                                 93F19A1808245E59001E9ABC /* KWQCString.cpp in Sources */,
     6542                                93F19A1708245E59001E9ABC /* PopUpButton.mm in Sources */,
     6543                                93F19A1808245E59001E9ABC /* DeprecatedCString.cpp in Sources */,
    65446544                                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
    65456545                                93F19A2E08245E59001E9ABC /* JavaAppletWidget.mm in Sources */,
    6546                                 93F19A3108245E59001E9ABC /* KWQLoader.mm in Sources */,
    6547                                 93F19A3A08245E59001E9ABC /* KWQLineEdit.mm in Sources */,
    6548                                 93F19A3B08245E59001E9ABC /* KWQListBox.mm in Sources */,
     6546                                93F19A3108245E59001E9ABC /* LoaderFunctions.mm in Sources */,
     6547                                93F19A3A08245E59001E9ABC /* TextField.mm in Sources */,
     6548                                93F19A3B08245E59001E9ABC /* ListBox.mm in Sources */,
    65496549                                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */,
    65506550                                93F19A3F08245E59001E9ABC /* WebCoreTextField.mm in Sources */,
    65516551                                93F19A4A08245E59001E9ABC /* RegularExpression.cpp in Sources */,
    65526552                                93F19A5108245E59001E9ABC /* WebCoreTextArea.mm in Sources */,
    6553                                 93F19A5308245E59001E9ABC /* KWQTextEdit.mm in Sources */,
    6554                                 93F19A5408245E59001E9ABC /* KWQTextStream.cpp in Sources */,
     6553                                93F19A5308245E59001E9ABC /* TextBox.mm in Sources */,
     6554                                93F19A5408245E59001E9ABC /* TextStream.cpp in Sources */,
    65556555                                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */,
    65566556                                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */,
    … …  
    65616561                                93F19A9D08245E59001E9ABC /* Decoder.cpp in Sources */,
    65626562                                93F19AB908245E59001E9ABC /* Range.cpp in Sources */,
    6563                                 93F19ABC08245E59001E9ABC /* xml_tokenizer.cpp in Sources */,
     6563                                93F19ABC08245E59001E9ABC /* XMLTokenizer.cpp in Sources */,
    65646564                                93F19ABE08245E59001E9ABC /* WebCoreCache.mm in Sources */,
    65656565                                93F19ABF08245E59001E9ABC /* WebCoreJavaScript.mm in Sources */,
    … …  
    65676567                                93F19AC608245E59001E9ABC /* WebCoreEncodings.mm in Sources */,
    65686568                                93F19AC808245E59001E9ABC /* WebCoreHistory.m in Sources */,
    6569                                 93F19ACC08245E59001E9ABC /* KWQFileButton.mm in Sources */,
    6570                                 93F19ACD08245E59001E9ABC /* KWQResourceLoader.mm in Sources */,
    6571                                 93F19AD208245E59001E9ABC /* KWQPageState.mm in Sources */,
     6569                                93F19ACC08245E59001E9ABC /* FileButton.mm in Sources */,
     6570                                93F19ACD08245E59001E9ABC /* WebCoreResourceLoaderImp.mm in Sources */,
     6571                                93F19AD208245E59001E9ABC /* WebCorePageState.mm in Sources */,
    65726572                                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */,
    6573                                 93F19ADC08245E59001E9ABC /* KWQScrollBar.mm in Sources */,
     6573                                93F19ADC08245E59001E9ABC /* WebCoreScrollBar.mm in Sources */,
    65746574                                93F19ADF08245E59001E9ABC /* WebCoreAXObject.mm in Sources */,
    65756575                                93F19AE008245E59001E9ABC /* AccessibilityObjectCache.mm in Sources */,
    65766576                                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */,
    65776577                                93F19AE508245E59001E9ABC /* WebCoreKeyGenerator.m in Sources */,
    6578                                 93F19AE608245E59001E9ABC /* KWQKSSLKeyGen.mm in Sources */,
    6579                                 93F19AF708245E59001E9ABC /* KWQEditCommand.mm in Sources */,
     6578                                93F19AE608245E59001E9ABC /* SSLKeyGenerator.mm in Sources */,
     6579                                93F19AF708245E59001E9ABC /* WebCoreEditCommand.mm in Sources */,
    65806580                                93F19AF808245E59001E9ABC /* Position.cpp in Sources */,
    6581                                 93F19AFA08245E59001E9ABC /* KWQSlider.mm in Sources */,
     6581                                93F19AFA08245E59001E9ABC /* WebCoreSlider.mm in Sources */,
    65826582                                93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */,
    65836583                                93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */,
    … …  
    65856585                                93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */,
    65866586                                93F19B0508245E59001E9ABC /* FormData.cpp in Sources */,
    6587                                 93F19B0608245E59001E9ABC /* KWQFormData.mm in Sources */,
     6587                                93F19B0608245E59001E9ABC /* FormDataMac.mm in Sources */,
    65886588                                93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */,
    65896589                                93F19B0808245E59001E9ABC /* WebDashboardRegion.m in Sources */,
    65906590                                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */,
    65916591                                BCEF3434087B563E00BBF833 /* HTMLElementFactory.cpp in Sources */,
    6592                                 A8FD8B86087CB44C00DC3707 /* KWQWMatrix.cpp in Sources */,
     6592                                A8FD8B86087CB44C00DC3707 /* AffineTransform.cpp in Sources */,
    65936593                                7E6FEED90898582300C44C3F /* WebCoreScriptDebugger.mm in Sources */,
    65946594                                939885C308B7E3D100E707C4 /* EventNames.cpp in Sources */,
    … …  
    66156615                                A88AD3B60952486E001DD196 /* QuartzSupport.mm in Sources */,
    66166616                                A88AD3B80952486E001DD196 /* KCanvasPathQuartz.mm in Sources */,
    6617                                 A88AD3B90952486E001DD196 /* KCanvasContainer.cpp in Sources */,
     6617                                A88AD3B90952486E001DD196 /* RenderSVGContainer.cpp in Sources */,
    66186618                                A88AD3BB0952486E001DD196 /* KCanvasCreator.cpp in Sources */,
    66196619                                A88AD3BD0952486E001DD196 /* KCanvasFilters.cpp in Sources */,
    … …  
    68406840                                BCEA4879097D93020094C9E4 /* RenderLayer.cpp in Sources */,
    68416841                                BCEA487F097D93020094C9E4 /* RenderObject.cpp in Sources */,
    6842                                 BCEA4883097D93020094C9E4 /* render_style.cpp in Sources */,
     6842                                BCEA4883097D93020094C9E4 /* RenderStyle.cpp in Sources */,
    68436843                                BCEA4888097D93020094C9E4 /* RenderThemeMac.mm in Sources */,
    68446844                                BCEA4889097D93020094C9E4 /* RenderTheme.cpp in Sources */,
    … …  
    68476847                                65FEA86909833ADE00BED4AB /* Page.cpp in Sources */,
    68486848                                BCEA4948097F0F770094C9E4 /* BrowserExtensionMac.mm in Sources */,
    6849                                 AB67D1A8097F3AE300F9392E /* RenderTextField.cpp in Sources */,
     6849                                AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */,
    68506850                                A8DF3FCF097FA0FC0052981B /* HTMLFormCollection.cpp in Sources */,
    68516851                                A8DF3FD1097FA0FC0052981B /* HTMLCollection.cpp in Sources */,
    … …  
    68806880                                6582A16209999D6D00BEEB6D /* ScreenMac.mm in Sources */,
    68816881                                6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */,
    6882                                 6582A17809999EA000BEEB6D /* QStringMac.mm in Sources */,
     6882                                6582A17809999EA000BEEB6D /* DeprecatedStringMac.mm in Sources */,
    68836883                                A7638A8C09958EA50007E14F /* WKDisplacementMapFilter.m in Sources */,
    68846884                                A7638A980995965D0007E14F /* SVGFEDisplacementMapElement.cpp in Sources */,
    … …  
    69336933                                935C475F09AC4CAE00A6AAB4 /* HistoryMac.mm in Sources */,
    69346934                                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
    6935                                 935C477109AC4D7300A6AAB4 /* MouseEventMac.mm in Sources */,
     6935                                935C477109AC4D7300A6AAB4 /* PlatformMouseEventMac.mm in Sources */,
    69366936                                935C477309AC4D7700A6AAB4 /* WheelEventMac.mm in Sources */,
    69376937                                651B4D8509AC83370029F1EF /* DeprecatedStringList.cpp in Sources */,
    6938                                 651B4D8F09AC859F0029F1EF /* QStringListMac.mm in Sources */,
     6938                                651B4D8F09AC859F0029F1EF /* DeprecatedStringListMac.mm in Sources */,
    69396939                                93032CC809AEC34300F82A18 /* PathCG.cpp in Sources */,
    69406940                                6593923709AE4346002C531F /* KURL.cpp in Sources */,

  • trunk/WebCore/WebCoreSources.bkl

    r15154 r15253  
    33        <set append="1" var="WEBCORE_SOURCES_KWQ">
    44               
    5                 kwq/KWQCString.cpp
    6                 kwq/KWQTextStream.cpp
     5                kwq/DeprecatedCString.cpp
     6                kwq/TextStream.cpp
    77        </set>
    88        <set append="1" var="WEBCORE_SOURCES_DERIVEDSOURCES">
    … …  
    418418                rendering/InlineTextBox.cpp
    419419                rendering/ListMarkerBox.cpp
    420                 rendering/render_style.cpp
     420                rendering/RenderStyle.cpp
    421421                rendering/RenderApplet.cpp
    422422                rendering/RenderArena.cpp
    … …  
    456456                rendering/RenderText.cpp
    457457                rendering/RenderTextArea.cpp
    458                 rendering/RenderTextField.cpp
     458                rendering/RenderTextControl.cpp
    459459                rendering/RenderTextFragment.cpp
    460460                rendering/RenderTheme.cpp
    … …  
    544544                dom/UIEvent.cpp
    545545                dom/WheelEvent.cpp
    546                 dom/xml_tokenizer.cpp
     546                dom/XMLTokenizer.cpp
    547547
    548548        </set>

  • trunk/WebCore/bindings/js/kjs_dom.cpp

    r14916 r15253  
    5252#include "JSRange.h"
    5353#include "JSText.h"
    54 #include "KWQKHTMLSettings.h"
     54#include "Settings.h"
    5555#include "NamedNodeMap.h"
    5656#include "Notation.h"

  • trunk/WebCore/bindings/js/kjs_window.cpp

    r15239 r15253  
    4444#include "JSXMLHttpRequest.h"
    4545#include "JSXMLSerializer.h"
    46 #include "KWQKHTMLSettings.h"
     46#include "Settings.h"
    4747#include "Logging.h"
    4848#include "Page.h"

  • trunk/WebCore/bindings/objc/DOMHTML.mm

    r15190 r15253  
    8686#import "NameNodeList.h"
    8787#import "markup.h"
    88 #import "RenderTextField.h"
     88#import "RenderTextControl.h"
    8989#import "FrameView.h"
    9090

  • trunk/WebCore/bridge/mac/FrameMac.h

    r15206 r15253  
    5353typedef DOMElement ObjCDOMElement;
    5454
    55 @class KWQPageState;
     55@class WebCorePageState;
    5656@class NSArray;
    5757@class NSAttributedString;
    … …  
    7474class ObjCDOMElement;
    7575
    76 class KWQPageState;
     76class WebCorePageState;
    7777class NSArray;
    7878class NSAttributedString;
    … …  
    105105struct DashboardRegionValue;
    106106
    107 enum KWQSelectionDirection {
    108     KWQSelectingNext,
    109     KWQSelectingPrevious
     107enum SelectionDirection {
     108    SelectingNext,
     109    SelectingPrevious
    110110};
    111111
    … …  
    146146    virtual void unfocusWindow();
    147147   
    148     void openURLFromPageCache(KWQPageState*);
     148    void openURLFromPageCache(WebCorePageState*);
    149149
    150150    virtual void saveDocumentState();
    … …  
    153153    virtual void addMessageToConsole(const String& message,  unsigned int lineNumber, const String& sourceID);
    154154   
    155     NSView* nextKeyView(Node* startingPoint, KWQSelectionDirection);
    156     NSView* nextKeyViewInFrameHierarchy(Node* startingPoint, KWQSelectionDirection);
    157     static NSView* nextKeyViewForWidget(Widget* startingPoint, KWQSelectionDirection);
     155    NSView* nextKeyView(Node* startingPoint, SelectionDirection);
     156    NSView* nextKeyViewInFrameHierarchy(Node* startingPoint, SelectionDirection);
     157    static NSView* nextKeyViewForWidget(Widget* startingPoint, SelectionDirection);
    158158    static bool currentEventIsKeyboardOptionTab();
    159159    static bool handleKeyboardOptionTabInView(NSView* view);
    … …  
    300300    void dashboardRegionsChanged();
    301301   
    302     virtual bool isCharacterSmartReplaceExempt(const QChar &, bool);
     302    virtual bool isCharacterSmartReplaceExempt(const DeprecatedChar &, bool);
    303303   
    304304    virtual bool mouseDownMayStartSelect() const { return _mouseDownMayStartSelect; }
    … …  
    327327    NSView* mouseDownViewIfStillGood();
    328328
    329     NSView* nextKeyViewInFrame(Node* startingPoint, KWQSelectionDirection);
     329    NSView* nextKeyViewInFrame(Node* startingPoint, SelectionDirection);
    330330    static NSView* documentViewForNode(Node*);
    331331   

  • trunk/WebCore/bridge/mac/FrameMac.mm

    r15206 r15253  
    5050#import "HTMLNames.h"
    5151#import "HTMLTableCellElement.h"
    52 #import "KWQEditCommand.h"
    53 #import "KWQFormData.h"
    54 #import "KWQPageState.h"
     52#import "WebCoreEditCommand.h"
     53#import "FormDataMac.h"
     54#import "WebCorePageState.h"
    5555#import "Logging.h"
    5656#import "MouseEventWithHitTestResults.h"
    … …  
    7777#import <JavaScriptCore/npruntime_impl.h>
    7878
    79 #undef _KWQ_TIMING
     79#undef _webcore_TIMING
    8080
    8181@interface NSObject (WebPlugIn)
    … …  
    171171   
    172172    [_bridge clearFrame];
    173     KWQRelease(_bridge);
     173    HardRelease(_bridge);
    174174    _bridge = nil;
    175175}
    … …  
    580580    cleanupPluginRootObjects();
    581581    _bindingRoot = 0;
    582     KWQRelease(_windowScriptObject);
     582    HardRelease(_windowScriptObject);
    583583    _windowScriptObject = 0;
    584584
    … …  
    723723            const UChar* chars = it.characters();
    724724            int len = it.length();
    725             if (len > 1 || !QChar(chars[0]).isSpace()) {
     725            if (len > 1 || !DeprecatedChar(chars[0]).isSpace()) {
    726726                NSString *chunk = [[NSString alloc] initWithCharactersNoCopy:const_cast<UChar*>(chars) length:len freeWhenDone:NO];
    727727                NSRange misspelling = [checker checkSpellingOfString:chunk startingAt:0 language:nil wrap:NO inSpellDocumentWithTag:[_bridge spellCheckerDocumentTag] wordCount:NULL];
    … …  
    770770    if (v) {
    771771        NSEvent *oldCurrentEvent = _currentEvent;
    772         _currentEvent = KWQRetain(event);
     772        _currentEvent = HardRetain(event);
    773773
    774774        PlatformWheelEvent qEvent(event);
    … …  
    776776
    777777        ASSERT(_currentEvent == event);
    778         KWQRelease(event);
     778        HardRelease(event);
    779779        _currentEvent = oldCurrentEvent;
    780780
    … …  
    786786    // of the elements rather than here in the part.
    787787
    788     KWQScrollDirection direction;
     788    ScrollDirection direction;
    789789    float multiplier;
    790790    float deltaX = [event deltaX];
    791791    float deltaY = [event deltaY];
    792792    if (deltaX < 0) {
    793         direction = KWQScrollRight;
     793        direction = ScrollRight;
    794794        multiplier = -deltaX;
    795795    } else if (deltaX > 0) {
    796         direction = KWQScrollLeft;
     796        direction = ScrollLeft;
    797797        multiplier = deltaX;
    798798    } else if (deltaY < 0) {
    799         direction = KWQScrollDown;
     799        direction = ScrollDown;
    800800        multiplier = -deltaY;
    801801    }  else if (deltaY > 0) {
    802         direction = KWQScrollUp;
     802        direction = ScrollUp;
    803803        multiplier = deltaY;
    804804    } else
    … …  
    821821        return false;
    822822   
    823     return r->scroll(direction, KWQScrollWheel, multiplier);
     823    return r->scroll(direction, ScrollByWheel, multiplier);
    824824}
    825825
    … …  
    872872}
    873873
    874 NSView* FrameMac::nextKeyViewInFrame(Node* node, KWQSelectionDirection direction)
     874NSView* FrameMac::nextKeyViewInFrame(Node* node, SelectionDirection direction)
    875875{
    876876    Document* doc = document();
    … …  
    879879   
    880880    for (;;) {
    881         node = direction == KWQSelectingNext
     881        node = direction == SelectingNext
    882882            ? doc->nextFocusNode(node) : doc->previousFocusNode(node);
    883883        if (!node)
    … …  
    903903}
    904904
    905 NSView *FrameMac::nextKeyViewInFrameHierarchy(Node *node, KWQSelectionDirection direction)
     905NSView *FrameMac::nextKeyViewInFrameHierarchy(Node *node, SelectionDirection direction)
    906906{
    907907    NSView *next = nextKeyViewInFrame(node, direction);
    … …  
    918918}
    919919
    920 NSView *FrameMac::nextKeyView(Node *node, KWQSelectionDirection direction)
     920NSView *FrameMac::nextKeyView(Node *node, SelectionDirection direction)
    921921{
    922922    NSView * next;
    … …  
    929929    // Look at views from the top level part up, looking for a next key view that we can use.
    930930
    931     next = direction == KWQSelectingNext
     931    next = direction == SelectingNext
    932932        ? [_bridge nextKeyViewOutsideWebFrameViews]
    933933        : [_bridge previousKeyViewOutsideWebFrameViews];
    … …  
    942942}
    943943
    944 NSView *FrameMac::nextKeyViewForWidget(Widget *startingWidget, KWQSelectionDirection direction)
     944NSView *FrameMac::nextKeyViewForWidget(Widget *startingWidget, SelectionDirection direction)
    945945{
    946946    // Use the event filter object to figure out which RenderWidget owns this Widget and get to the DOM.
    … …  
    10701070        KJS::JSLock lock;
    10711071        KJS::JSObject *win = KJS::Window::retrieveWindow(this);
    1072         _windowScriptObject = KWQRetainNSRelease([[WebScriptObject alloc] _initWithJSObject:win originExecutionContext:bindingRootObject() executionContext:bindingRootObject()]);
     1072        _windowScriptObject = HardRetainWithNSRelease([[WebScriptObject alloc] _initWithJSObject:win originExecutionContext:bindingRootObject() executionContext:bindingRootObject()]);
    10731073    }
    10741074
    … …  
    11011101}
    11021102
    1103 void FrameMac::openURLFromPageCache(KWQPageState *state)
    1104 {
    1105     // It's safe to assume none of the KWQPageState methods will raise
    1106     // exceptions, since KWQPageState is implemented by WebCore and
     1103void FrameMac::openURLFromPageCache(WebCorePageState *state)
     1104{
     1105    // It's safe to assume none of the WebCorePageState methods will raise
     1106    // exceptions, since WebCorePageState is implemented by WebCore and
    11071107    // does not throw
    11081108
    … …  
    13501350
    13511351    NSEvent *oldCurrentEvent = _currentEvent;
    1352     _currentEvent = KWQRetain(event);
     1352    _currentEvent = HardRetain(event);
    13531353
    13541354    PlatformKeyboardEvent qEvent(event);
    … …  
    13661366
    13671367    ASSERT(_currentEvent == event);
    1368     KWQRelease(event);
     1368    HardRelease(event);
    13691369    _currentEvent = oldCurrentEvent;
    13701370
    … …  
    19531953   
    19541954    NSEvent *oldCurrentEvent = _currentEvent;
    1955     _currentEvent = KWQRetain(event);
     1955    _currentEvent = HardRetain(event);
    19561956    m_mouseDown = PlatformMouseEvent(event);
    19571957    NSPoint loc = [event locationInWindow];
    … …  
    19651965   
    19661966    ASSERT(_currentEvent == event);
    1967     KWQRelease(event);
     1967    HardRelease(event);
    19681968    _currentEvent = oldCurrentEvent;
    19691969
    … …  
    19811981
    19821982    NSEvent *oldCurrentEvent = _currentEvent;
    1983     _currentEvent = KWQRetain(event);
     1983    _currentEvent = HardRetain(event);
    19841984
    19851985    v->handleMouseMoveEvent(event);
    19861986   
    19871987    ASSERT(_currentEvent == event);
    1988     KWQRelease(event);
     1988    HardRelease(event);
    19891989    _currentEvent = oldCurrentEvent;
    19901990
    … …  
    20012001
    20022002    NSEvent *oldCurrentEvent = _currentEvent;
    2003     _currentEvent = KWQRetain(event);
     2003    _currentEvent = HardRetain(event);
    20042004
    20052005    // Our behavior here is a little different that Qt. Qt always sends
    … …  
    20172017   
    20182018    ASSERT(_currentEvent == event);
    2019     KWQRelease(event);
     2019    HardRelease(event);
    20202020    _currentEvent = oldCurrentEvent;
    20212021   
    … …  
    20972097
    20982098    NSEvent *oldCurrentEvent = _currentEvent;
    2099     _currentEvent = KWQRetain(event);
     2099    _currentEvent = HardRetain(event);
    21002100   
    21012101    v->handleMouseMoveEvent(event);
    21022102   
    21032103    ASSERT(_currentEvent == event);
    2104     KWQRelease(event);
     2104    HardRelease(event);
    21052105    _currentEvent = oldCurrentEvent;
    21062106
    … …  
    21332133
    21342134    NSEvent *oldCurrentEvent = _currentEvent;
    2135     _currentEvent = KWQRetain(event);
     2135    _currentEvent = HardRetain(event);
    21362136   
    21372137    PlatformMouseEvent mouseEvent(event);
    … …  
    21492149
    21502150    ASSERT(_currentEvent == event);
    2151     KWQRelease(event);
     2151    HardRelease(event);
    21522152    _currentEvent = oldCurrentEvent;
    21532153
    … …  
    23882388                        switch(style->listStyleType()) {
    23892389                            case DISC:
    2390                                 listText += ((QChar)BULLET_CHAR);
     2390                                listText += ((DeprecatedChar)BULLET_CHAR);
    23912391                                break;
    23922392                            case CIRCLE:
    2393                                 listText += ((QChar)CIRCLE_CHAR);
     2393                                listText += ((DeprecatedChar)CIRCLE_CHAR);
    23942394                                break;
    23952395                            case SQUARE:
    2396                                 listText += ((QChar)SQUARE_CHAR);
     2396                                listText += ((DeprecatedChar)SQUARE_CHAR);
    23972397                                break;
    23982398                            case LNONE:
    … …  
    28542854        return;
    28552855
    2856     KWQRetain(bridge);
    2857     KWQRelease(_bridge);
     2856    HardRetain(bridge);
     2857    HardRelease(_bridge);
    28582858    _bridge = bridge;
    28592859}
    … …  
    29792979{
    29802980    ASSERT(cmd.get());
    2981     KWQEditCommand *kwq = [KWQEditCommand commandWithEditCommand:cmd.get()];
     2981    WebCoreEditCommand *kwq = [WebCoreEditCommand commandWithEditCommand:cmd.get()];
    29822982    NSUndoManager *undoManager = [_bridge undoManager];
    29832983    [undoManager registerUndoWithTarget:_bridge selector:(isRedo ? @selector(redoEditing:) : @selector(undoEditing:)) object:kwq];
    … …  
    30933093        const UChar* chars = it.characters();
    30943094        int len = it.length();
    3095         if (len > 1 || !QChar(chars[0]).isSpace()) {
     3095        if (len > 1 || !DeprecatedChar(chars[0]).isSpace()) {
    30963096            NSString *chunk = [[NSString alloc] initWithCharactersNoCopy:const_cast<UChar*>(chars) length:len freeWhenDone:NO];
    30973097            int startIndex = 0;
    … …  
    33663366}
    33673367
    3368 bool FrameMac::isCharacterSmartReplaceExempt(const QChar &c, bool isPreviousChar)
     3368bool FrameMac::isCharacterSmartReplaceExempt(const DeprecatedChar &c, bool isPreviousChar)
    33693369{
    33703370    return [_bridge isCharacterSmartReplaceExempt:c.unicode() isPreviousCharacter:isPreviousChar];

  • trunk/WebCore/bridge/mac/WebCoreFrameBridge.mm

    r15222 r15253  
    4747#import "HTMLNames.h"
    4848#import "Image.h"
    49 #import "KWQEditCommand.h"
    50 #import "KWQLoader.h"
    51 #import "KWQPageState.h"
     49#import "WebCoreEditCommand.h"
     50#import "LoaderFunctions.h"
     51#import "WebCorePageState.h"
    5252#import "ModifySelectionListLevel.h"
    5353#import "MoveSelectionCommand.h"
    … …  
    7575#import "markup.h"
    7676#import "visible_units.h"
    77 #import "xml_tokenizer.h"
     77#import "XMLTokenizer.h"
    7878#import <JavaScriptCore/date_object.h>
    7979#import <JavaScriptCore/runtime_root.h>
    … …  
    518518{
    519519    if (pageCache) {
    520         KWQPageState *state = [pageCache objectForKey:WebCorePageCacheStateKey];
     520        WebCorePageState *state = [pageCache objectForKey:WebCorePageCacheStateKey];
    521521        m_frame->openURLFromPageCache(state);
    522522        [state invalidate];
    … …  
    584584        doc->setInPageCache(NO);
    585585
    586     KWQPageState *state = [pageCache objectForKey:WebCorePageCacheStateKey];
     586    WebCorePageState *state = [pageCache objectForKey:WebCorePageCacheStateKey];
    587587
    588588    // FIXME: This is a grotesque hack to fix <rdar://problem/4059059> Crash in RenderFlow::detach
    589     // Somehow the KWQPageState object is not properly updated, and is holding onto a stale document
     589    // Somehow the WebCorePageState object is not properly updated, and is holding onto a stale document
    590590    // both Xcode and FileMaker see this crash, Safari does not.
    591591    // This if check MUST be removed as part of re-writing the loader down in WebCore
    … …  
    650650    if (!m_frame)
    651651        return NO;
    652     return m_frame->scrollOverflow((KWQScrollDirection)direction, (KWQScrollGranularity)granularity);
     652    return m_frame->scrollOverflow((ScrollDirection)direction, (ScrollGranularity)granularity);
    653653}
    654654
    … …  
    679679    m_frame->saveInterpreterBuiltins(*interpreterBuiltins);
    680680
    681     KWQPageState *pageState = [[KWQPageState alloc] initWithDocument:doc
     681    WebCorePageState *pageState = [[WebCorePageState alloc] initWithDocument:doc
    682682                                                                 URL:m_frame->url()
    683683                                                    windowProperties:windowProperties
    … …  
    12731273    if (!doc)
    12741274        return nil;
    1275     return m_frame->nextKeyView(doc->focusNode(), KWQSelectingNext);
     1275    return m_frame->nextKeyView(doc->focusNode(), SelectingNext);
    12761276}
    12771277
    … …  
    12811281    if (!doc)
    12821282        return nil;
    1283     return m_frame->nextKeyView(doc->focusNode(), KWQSelectingPrevious);
     1283    return m_frame->nextKeyView(doc->focusNode(), SelectingPrevious);
    12841284}
    12851285
    … …  
    12891289    if (!doc)
    12901290        return nil;
    1291     return m_frame->nextKeyViewInFrameHierarchy(doc->focusNode(), KWQSelectingNext);
     1291    return m_frame->nextKeyViewInFrameHierarchy(doc->focusNode(), SelectingNext);
    12921292}
    12931293
    … …  
    12971297    if (!doc)
    12981298        return nil;
    1299     return m_frame->nextKeyViewInFrameHierarchy(doc->focusNode(), KWQSelectingPrevious);
     1299    return m_frame->nextKeyViewInFrameHierarchy(doc->focusNode(), SelectingPrevious);
    13001300}
    13011301
    … …  
    15161516   
    15171517    if (doc)
    1518         return KWQNumberOfPendingOrLoadingRequests (doc->docLoader());
     1518        return NumberOfPendingOrLoadingRequests (doc->docLoader());
    15191519    return 0;
    15201520}
    … …  
    15731573- (void)undoEditing:(id)arg
    15741574{
    1575     ASSERT([arg isKindOfClass:[KWQEditCommand class]]);
     1575    ASSERT([arg isKindOfClass:[WebCoreEditCommand class]]);
    15761576    [arg command]->unapply();
    15771577}
    … …  
    15791579- (void)redoEditing:(id)arg
    15801580{
    1581     ASSERT([arg isKindOfClass:[KWQEditCommand class]]);
     1581    ASSERT([arg isKindOfClass:[WebCoreEditCommand class]]);
    15821582    [arg command]->reapply();
    15831583}
    … …  
    18971897    bool addLeadingSpace = startPos.leadingWhitespacePosition(VP_DEFAULT_AFFINITY, true).isNull() && !isStartOfParagraph(startVisiblePos);
    18981898    if (addLeadingSpace) {
    1899         QChar previousChar = startVisiblePos.previous().characterAfter();
     1899        DeprecatedChar previousChar = startVisiblePos.previous().characterAfter();
    19001900        if (previousChar.unicode())
    19011901            addLeadingSpace = !m_frame->isCharacterSmartReplaceExempt(previousChar, true);
    … …  
    19041904    bool addTrailingSpace = endPos.trailingWhitespacePosition(VP_DEFAULT_AFFINITY, true).isNull() && !isEndOfParagraph(endVisiblePos);
    19051905    if (addTrailingSpace) {
    1906         QChar thisChar = endVisiblePos.characterAfter();
     1906        DeprecatedChar thisChar = endVisiblePos.characterAfter();
    19071907        if (thisChar.unicode())
    19081908            addTrailingSpace = !m_frame->isCharacterSmartReplaceExempt(thisChar, false);

  • trunk/WebCore/bridge/mac/WebCoreSettings.h

    r13682 r15253  
    2727
    2828#ifdef __cplusplus
    29 class KHTMLSettings;
     29class Settings;
    3030#else
    31 @class KHTMLSettings;
     31@class Settings;
    3232#endif
    3333
    … …  
    5555    NSString *defaultTextEncoding;
    5656   
    57     KHTMLSettings *settings;
     57    Settings *settings;
    5858}
    5959
    … …  
    118118- (NSString *)defaultTextEncoding;
    119119
    120 - (KHTMLSettings *)settings;
     120- (Settings *)settings;
    121121
    122122@end

  • trunk/WebCore/bridge/mac/WebCoreSettings.mm

    r13682 r15253  
    2828
    2929#import "FoundationExtras.h"
    30 #import "KWQKHTMLSettings.h"
     30#import "Settings.h"
    3131#import "Page.h"
    3232#import "WebCoreFrameBridge.h"
    … …  
    6060- (id)init
    6161{
    62     // A Frame may not have been created yet, so we initialize the AtomicString hash before we try and use it in KHTMLSettings.
     62    // A Frame may not have been created yet, so we initialize the AtomicString hash before we try and use it in Settings.
    6363    AtomicString::init();
    64     settings = new KHTMLSettings;
     64    settings = new Settings;
    6565    return [super init];
    6666}
    … …  
    334334}
    335335
    336 - (KHTMLSettings *)settings
     336- (Settings *)settings
    337337{
    338338    return settings;

  • trunk/WebCore/bridge/win/FrameWin.cpp

    r15172 r15253  
    3131#include "Document.h"
    3232#include "FramePrivate.h"
    33 #include "KWQKHTMLSettings.h"
     33#include "Settings.h"
    3434#include "PlatformKeyboardEvent.h"
    3535#include "Plugin.h"
    … …  
    4444{
    4545    d->m_extension = new BrowserExtensionWin(this);
    46     KHTMLSettings* settings = new KHTMLSettings();
     46    Settings* settings = new Settings();
    4747    settings->setAutoLoadImages(true);
    4848    settings->setMediumFixedFontSize(13);

  • trunk/WebCore/css/CSSPrimitiveValue.cpp

    r14775 r15253  
    2929#include "ExceptionCode.h"
    3030#include "Pair.h"
    31 #include "render_style.h"
     31#include "RenderStyle.h"
    3232
    3333namespace WebCore {

  • trunk/WebCore/css/CSSValueKeywords.in

    r15095 r15253  
    55#
    66# The Values are sorted according to the properties they belong to,
    7 # and have to be in the same order as the enums in render_style.h.
     7# and have to be in the same order as the enums in RenderStyle.h.
    88#
    99# If not, the optimizations in the cssparser and style selector will fail,

  • trunk/WebCore/css/MediaQueryEvaluator.cpp

    r15054 r15253  
    3838#include "MediaQuery.h"
    3939#include "MediaQueryExp.h"
    40 #include "rendering/render_style.h"
     40#include "rendering/RenderStyle.h"
    4141#include "page/FrameView.h"
    4242#include "Screen.h"
    … …  
    149149                && i2->isPrimitiveValue() && static_cast<CSSPrimitiveValue*>(i2)->primitiveType() == CSSPrimitiveValue::CSS_NUMBER) {
    150150                String str = static_cast<CSSPrimitiveValue*>(i1)->getStringValue();
    151                 if (!str.isNull() && str.length() == 1 && str[0] == QChar('/')) {
     151                if (!str.isNull() && str.length() == 1 && str[0] == DeprecatedChar('/')) {
    152152                    a = (int) static_cast<CSSPrimitiveValue*>(i0)->getFloatValue(CSSPrimitiveValue::CSS_NUMBER);
    153153                    b = (int) static_cast<CSSPrimitiveValue*>(i2)->getFloatValue(CSSPrimitiveValue::CSS_NUMBER);

  • trunk/WebCore/css/cssparser.cpp

    r15151 r15253  
    27032703
    27042704#ifdef TOKEN_DEBUG
    2705     qDebug("CSSTokenizer: got token %d: '%s'", token, token == END_TOKEN ? "" : DeprecatedString((QChar *)t, length).latin1());
     2705    qDebug("CSSTokenizer: got token %d: '%s'", token, token == END_TOKEN ? "" : DeprecatedString((DeprecatedChar *)t, length).latin1());
    27062706#endif
    27072707    switch(token) {
    … …  
    27582758    case FLOAT:
    27592759    case INTEGER:
    2760         yylval->val = DeprecatedString((QChar *)t, length).toDouble();
     2760        yylval->val = DeprecatedString((DeprecatedChar *)t, length).toDouble();
    27612761        break;
    27622762
    … …  
    30583058DeprecatedString deprecatedString(const ParseString& ps)
    30593059{
    3060     return DeprecatedString(reinterpret_cast<const QChar*>(ps.characters), ps.length);
     3060    return DeprecatedString(reinterpret_cast<const DeprecatedChar*>(ps.characters), ps.length);
    30613061}
    30623062

  • trunk/WebCore/css/cssstyleselector.cpp

    r15177 r15253  
    4848#include "HTMLNames.h"
    4949#include "History.h"
    50 #include "KWQKHTMLSettings.h"
     50#include "Settings.h"
    5151#include "MediaList.h"
    5252#include "MediaQueryEvaluator.h"
    … …  
    617617    }
    618618   
    619     QConstString cu(reinterpret_cast<const QChar*>(attr.characters()), attr.length());
     619    DeprecatedConstString cu(reinterpret_cast<const DeprecatedChar*>(attr.characters()), attr.length());
    620620    DeprecatedString u = cu.string();
    621621    if (!u.contains("://")) {

  • trunk/WebCore/css/cssstyleselector.h

    r15095 r15253  
    2626
    2727#include "DeprecatedString.h"
    28 #include "render_style.h"
     28#include "RenderStyle.h"
    2929#include <wtf/HashSet.h>
    3030#include <wtf/Vector.h>
    3131
    32 class KHTMLSettings;
     32class Settings;
    3333class KURL;
    3434
    … …  
    226226        FrameView *view;
    227227        Frame *frame;
    228         const KHTMLSettings *settings;
     228        const Settings *settings;
    229229        bool fontDirty;
    230230        bool isXMLDoc;

  • trunk/WebCore/dom/CharacterData.cpp

    r14916 r15253  
    2828#include "EventNames.h"
    2929#include "ExceptionCode.h"
    30 #include "KWQTextStream.h"
     30#include "TextStream.h"
    3131#include "MutationEvent.h"
    3232#include "RenderText.h"
    … …  
    310310
    311311#ifndef NDEBUG
    312 void CharacterData::dump(QTextStream *stream, DeprecatedString ind) const
     312void CharacterData::dump(TextStream *stream, DeprecatedString ind) const
    313313{
    314314    *stream << " str=\"" << String(str).deprecatedString().ascii() << "\"";

  • trunk/WebCore/dom/CharacterData.h

    r13393 r15253  
    6868   
    6969#ifndef NDEBUG
    70     virtual void dump(QTextStream*, DeprecatedString ind = "") const;
     70    virtual void dump(TextStream*, DeprecatedString ind = "") const;
    7171#endif
    7272

  • trunk/WebCore/dom/Document.cpp

    r15247 r15253  
    8282#include "kjs_binding.h"
    8383#include "kjs_proxy.h"
    84 #include "xml_tokenizer.h"
     84#include "XMLTokenizer.h"
    8585#include "xmlhttprequest.h"
    8686
    … …  
    844844        fontDescription.setUsePrinterFont(printing());
    845845        if (m_view) {
    846             const KHTMLSettings *settings = m_view->frame()->settings();
     846            const Settings *settings = m_view->frame()->settings();
    847847            if (printing() && !settings->shouldPrintBackgrounds())
    848848                _style->setForceBackgroundsToWhite(true);

  • trunk/WebCore/dom/Element.cpp

    r15177 r15253  
    3434#include "RenderBlock.h"
    3535#include "SelectionController.h"
    36 #include "KWQTextStream.h"
     36#include "TextStream.h"
    3737
    3838namespace WebCore {
    … …  
    155155}
    156156
    157 void Element::scrollByUnits(int units, KWQScrollGranularity granularity)
     157void Element::scrollByUnits(int units, ScrollGranularity granularity)
    158158{
    159159    document()->updateLayoutIgnorePendingStylesheets();
    160160    if (RenderObject *rend = renderer()) {
    161161        if (rend->hasOverflowClip()) {
    162             KWQScrollDirection direction = KWQScrollDown;
     162            ScrollDirection direction = ScrollDown;
    163163            if (units < 0) {
    164                 direction = KWQScrollUp;
     164                direction = ScrollUp;
    165165                units = -units;
    166166            }
    … …  
    172172void Element::scrollByLines(int lines)
    173173{
    174     scrollByUnits(lines, KWQScrollLine);
     174    scrollByUnits(lines, ScrollByLine);
    175175}
    176176
    177177void Element::scrollByPages(int pages)
    178178{
    179     scrollByUnits(pages, KWQScrollPage);
     179    scrollByUnits(pages, ScrollByPage);
    180180}
    181181
    … …  
    700700
    701701#ifndef NDEBUG
    702 void Element::dump(QTextStream *stream, DeprecatedString ind) const
     702void Element::dump(TextStream *stream, DeprecatedString ind) const
    703703{
    704704    updateStyleAttributeIfNeeded();

  • trunk/WebCore/dom/Element.h

    r14646 r15253  
    2929
    3030#include "Attr.h"
    31 #include "KWQScrollBar.h"
     31#include "WebCoreScrollBar.h"
    3232
    3333namespace WebCore {
    … …  
    6868    void scrollIntoViewIfNeeded(bool centerIfNeeded);
    6969
    70     void scrollByUnits(int units, KWQScrollGranularity granularity);
     70    void scrollByUnits(int units, ScrollGranularity granularity);
    7171    void scrollByLines(int lines);
    7272    void scrollByPages(int pages);
    … …  
    156156   
    157157#if !NDEBUG
    158     virtual void dump(QTextStream *stream, DeprecatedString ind = "") const;
     158    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;
    159159    virtual void formatForDebugger(char *buffer, unsigned length) const;
    160160#endif

  • trunk/WebCore/dom/EventTargetNode.cpp

    r15047 r15253  
    3434#include "Frame.h"
    3535#include "HTMLNames.h"
    36 #include "KWQTextStream.h"
     36#include "TextStream.h"
    3737#include "KeyboardEvent.h"
    3838#include "MouseEvent.h"
    … …  
    420420        swallowEvent = true;
    421421   
    422     // Special case: If it's a double click event, we also send the KHTML_DBLCLICK event. This is not part
     422    // Special case: If it's a double click event, we also send the dblclick event. This is not part
    423423    // of the DOM specs, but is used for compatibility with the ondblclick="" attribute.  This is treated
    424424    // as a separate event in other DOM-compliant browsers like Firefox, and so we do the same.
    … …  
    527527#ifndef NDEBUG
    528528
    529 void EventTargetNode::dump(QTextStream* stream, DeprecatedString ind) const
     529void EventTargetNode::dump(TextStream* stream, DeprecatedString ind) const
    530530{
    531531    if (m_regdListeners)

  • trunk/WebCore/dom/EventTargetNode.h

    r15154 r15253  
    8989   
    9090#ifndef NDEBUG
    91     virtual void dump(QTextStream*, DeprecatedString indent = "") const;
     91    virtual void dump(TextStream*, DeprecatedString indent = "") const;
    9292#endif
    9393

  • trunk/WebCore/dom/Node.cpp

    r15177 r15253  
    3737#include "kjs_binding.h"
    3838#include "RenderObject.h"
    39 #include "KWQTextStream.h"
     39#include "TextStream.h"
    4040
    4141namespace WebCore {
    … …  
    676676
    677677#ifndef NDEBUG
    678 void Node::dump(QTextStream *stream, DeprecatedString ind) const
     678void Node::dump(TextStream *stream, DeprecatedString ind) const
    679679{
    680680    // ### implement dump() for all appropriate subclasses

  • trunk/WebCore/dom/Node.h

    r15177 r15253  
    3535
    3636class DeprecatedStringList;
    37 class QTextStream;
     37class TextStream;
    3838class RenderArena;
    3939
    … …  
    339339   
    340340#ifndef NDEBUG
    341     virtual void dump(QTextStream*, DeprecatedString indent = "") const;
     341    virtual void dump(TextStream*, DeprecatedString indent = "") const;
    342342#endif
    343343

  • trunk/WebCore/dom/Position.cpp

    r15112 r15253  
    610610        String string = static_cast<Text *>(prev.node())->data();
    611611        UChar c = string[prev.offset()];
    612         if (considerNonCollapsibleWhitespace ? (QChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
     612        if (considerNonCollapsibleWhitespace ? (DeprecatedChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
    613613            return prev;
    614614    }
    … …  
    627627            String string = textNode->data();
    628628            UChar c = string[offset()];
    629             if (considerNonCollapsibleWhitespace ? (QChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
     629            if (considerNonCollapsibleWhitespace ? (DeprecatedChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
    630630                return *this;
    631631            return Position();
    … …  
    640640        String string = static_cast<Text*>(next.node())->data();
    641641        UChar c = string[0];
    642         if (considerNonCollapsibleWhitespace ? (QChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
     642        if (considerNonCollapsibleWhitespace ? (DeprecatedChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
    643643            return next;
    644644    }

  • trunk/WebCore/dom/ProcessingInstruction.cpp

    r14846 r15253  
    3030#include "ExceptionCode.h"
    3131#include "XSLStyleSheet.h"
    32 #include "xml_tokenizer.h" // for parseAttributes()
     32#include "XMLTokenizer.h" // for parseAttributes()
    3333
    3434namespace WebCore {

  • trunk/WebCore/dom/QualifiedName.cpp

    r14314 r15253  
    2323
    2424#if AVOID_STATIC_CONSTRUCTORS
    25 #define KHTML_QNAME_HIDE_GLOBALS 1
     25#define WEBCORE_QUALIFIEDNAME_HIDE_GLOBALS 1
    2626#else
    2727#define QNAME_DEFAULT_CONSTRUCTOR

  • trunk/WebCore/dom/QualifiedName.h

    r14315 r15253  
    7272};
    7373
    74 #if !KHTML_QNAME_HIDE_GLOBALS
     74#if !WEBCORE_QUALIFIEDNAME_HIDE_GLOBALS
    7575extern const QualifiedName anyName;
    7676inline const QualifiedName& anyQName() { return anyName; }

  • trunk/WebCore/dom/XMLTokenizer.cpp

    r15251 r15253  
    2323
    2424#include "config.h"
    25 #include "xml_tokenizer.h"
     25#include "XMLTokenizer.h"
    2626
    2727#include "CDATASection.h"
    … …  
    3939#include "HTMLTableSectionElement.h"
    4040#include "HTMLTokenizer.h"
    41 #include "KWQLoader.h"
     41#include "LoaderFunctions.h"
    4242#include "ProcessingInstruction.h"
    4343#include "TransferJob.h"
    … …  
    461461    TransferJob* job = new TransferJob(0, "GET", uri);
    462462    DeprecatedString headers;
    463     Vector<char> data = KWQServeSynchronousRequest(Cache::loader(), globalDocLoader, job, finalURL, headers);
     463    Vector<char> data = ServeSynchronousRequest(Cache::loader(), globalDocLoader, job, finalURL, headers);
    464464   
    465465    return new OffsetBuffer(data);
    … …  
    514514    parser->_private = userData;
    515515    parser->replaceEntities = true;
    516     const QChar BOM(0xFEFF);
     516    const DeprecatedChar BOM(0xFEFF);
    517517    const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char *>(&BOM);
    518518    xmlSwitchEncoding(parser, BOMHighByte == 0xFF ? XML_CHAR_ENCODING_UTF16LE : XML_CHAR_ENCODING_UTF16BE);
    … …  
    635635    // will detect <?xml version="1.0" encoding="<encoding name>"?> blocks
    636636    // and switch encodings, causing the parse to fail.
    637     const QChar BOM(0xFEFF);
     637    const DeprecatedChar BOM(0xFEFF);
    638638    const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char *>(&BOM);
    639639    xmlSwitchEncoding(m_context, BOMHighByte == 0xFF ? XML_CHAR_ENCODING_UTF16LE : XML_CHAR_ENCODING_UTF16BE);
    640640   
    641     xmlParseChunk(m_context, reinterpret_cast<const char *>(parseString.unicode()), sizeof(QChar) * parseString.length(), 0);
     641    xmlParseChunk(m_context, reinterpret_cast<const char *>(parseString.unicode()), sizeof(DeprecatedChar) * parseString.length(), 0);
    642642   
    643643    return false;
    … …  
    11061106        return 0;
    11071107
    1108     DeprecatedCString value = DeprecatedString(QChar(c)).utf8();
     1108    DeprecatedCString value = DeprecatedString(DeprecatedChar(c)).utf8();
    11091109    assert(value.length() < 5);
    11101110    sharedXHTMLEntity.length = value.length();
    … …  
    13341334    // FIXME: Hook up error handlers so that a failure to parse the main document results in
    13351335    // good error messages.
    1336     const QChar BOM(0xFEFF);
     1336    const DeprecatedChar BOM(0xFEFF);
    13371337    const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char *>(&BOM);
    13381338
    … …  
    13441344   
    13451345    xmlDocPtr sourceDoc = xmlReadMemory(reinterpret_cast<const char *>(source.unicode()),
    1346                                         source.length() * sizeof(QChar),
     1346                                        source.length() * sizeof(DeprecatedChar),
    13471347                                        url.ascii(),
    13481348                                        BOMHighByte == 0xFF ? "UTF-16LE" : "UTF-16BE",
    … …  
    15111511    xmlParserCtxtPtr parser = createQStringParser(&sax, &state);
    15121512    DeprecatedString parseString = "<?xml version=\"1.0\"?><attrs " + string.deprecatedString() + " />";
    1513     xmlParseChunk(parser, reinterpret_cast<const char *>(parseString.unicode()), parseString.length() * sizeof(QChar), 1);
     1513    xmlParseChunk(parser, reinterpret_cast<const char *>(parseString.unicode()), parseString.length() * sizeof(DeprecatedChar), 1);
    15141514    if (parser->myDoc)
    15151515        xmlFreeDoc(parser->myDoc);

  • trunk/WebCore/editing/EditAction.h

    r15080 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_EDIT_ACTIONS_H
    27 #define KHTML_EDITING_EDIT_ACTIONS_H
     26#ifndef EditAction_h
     27#define EditAction_h
    2828
    2929namespace WebCore {

  • trunk/WebCore/editing/HTMLInterchange.cpp

    r14273 r15253  
    4141        convertedSpaceString += AppleConvertedSpace;
    4242        convertedSpaceString += "\">";
    43         convertedSpaceString += QChar(0xa0);
     43        convertedSpaceString += DeprecatedChar(0xa0);
    4444        convertedSpaceString += "</span>";
    4545    }

  • trunk/WebCore/editing/HTMLInterchange.h

    r13393 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_HTML_INTERCHANGE_H
    27 #define KHTML_EDITING_HTML_INTERCHANGE_H
     26#ifndef HTMLInterchange_h
     27#define HTMLInterchange_h
    2828
    2929class DeprecatedString;

  • trunk/WebCore/editing/Selection.h

    r15226 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_SELECTION_H
    27 #define KHTML_EDITING_SELECTION_H
     26#ifndef Selection_h
     27#define Selection_h
    2828
    2929#include "Position.h"
    … …  
    122122#endif
    123123
    124 #endif // KHTML_EDITING_SELECTION_H
     124#endif // Selection_h

  • trunk/WebCore/editing/SelectionController.h

    r14498 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_SELECTIONCONTROLLER_H
    27 #define KHTML_EDITING_SELECTIONCONTROLLER_H
     26#ifndef SelectionController_h
     27#define SelectionController_h
    2828
    2929#include "IntRect.h"
    … …  
    202202#endif
    203203
    204 #endif // KHTML_EDITING_SELECTIONCONTROLLER_H
     204#endif // SelectionController_h

  • trunk/WebCore/editing/TextAffinity.h

    r13393 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_TEXT_AFFINITY_H
    27 #define KHTML_EDITING_TEXT_AFFINITY_H
     26#ifndef TextAffinity_h
     27#define TextAffinity_h
    2828
    2929namespace WebCore {

  • trunk/WebCore/editing/TextIterator.cpp

    r14777 r15253  
    844844    while (numChars > 0 && !atEnd()) {
    845845        int runSize = min(numChars, length());
    846         result.append(reinterpret_cast<const QChar*>(characters()), runSize);
     846        result.append(reinterpret_cast<const DeprecatedChar*>(characters()), runSize);
    847847        numChars -= runSize;
    848848        advance(runSize);
    … …  
    895895    while (1) {
    896896        // If this chunk ends in whitespace we can just use it as our chunk.
    897         if (QChar(m_textIterator.characters()[m_textIterator.length() - 1]).isSpace())
     897        if (DeprecatedChar(m_textIterator.characters()[m_textIterator.length() - 1]).isSpace())
    898898            return;
    899899
    … …  
    906906        // Look ahead to next chunk.  If it is whitespace or a break, we can use the previous stuff
    907907        m_textIterator.advance();
    908         if (m_textIterator.atEnd() || m_textIterator.length() == 0 || QChar(m_textIterator.characters()[0]).isSpace()) {
     908        if (m_textIterator.atEnd() || m_textIterator.length() == 0 || DeprecatedChar(m_textIterator.characters()[0]).isSpace()) {
    909909            m_didLookAhead = true;
    910910            return;
    … …  
    913913        if (m_buffer.isEmpty()) {
    914914            // Start gobbling chunks until we get to a suitable stopping point
    915             m_buffer.append(reinterpret_cast<const QChar*>(m_previousText), m_previousLength);
     915            m_buffer.append(reinterpret_cast<const DeprecatedChar*>(m_previousText), m_previousLength);
    916916            m_previousText = 0;
    917917        }
    918         m_buffer.append(reinterpret_cast<const QChar*>(m_textIterator.characters()), m_textIterator.length());
     918        m_buffer.append(reinterpret_cast<const DeprecatedChar*>(m_textIterator.characters()), m_textIterator.length());
    919919        int exception = 0;
    920920        m_range->setEnd(m_textIterator.range()->endContainer(exception), m_textIterator.range()->endOffset(exception), exception);
    … …  
    10971097    DeprecatedString result("");
    10981098    for (TextIterator it(r); !it.atEnd(); it.advance())
    1099         result.append(reinterpret_cast<const QChar*>(it.characters()), it.length());
     1099        result.append(reinterpret_cast<const DeprecatedChar*>(it.characters()), it.length());
    11001100    return result;
    11011101}

  • trunk/WebCore/editing/TextIterator.h

    r14276 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_VISIBLE_TEXT_H
    27 #define KHTML_EDITING_VISIBLE_TEXT_H
     26#ifndef TextIterator_h
     27#define TextIterator_h
    2828
    2929#include "DeprecatedString.h"

  • trunk/WebCore/editing/VisiblePosition.h

    r15117 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_VISIBLE_POSITION_H
    27 #define KHTML_EDITING_VISIBLE_POSITION_H
     26#ifndef VisiblePosition_h
     27#define VisiblePosition_h
    2828
    2929#include "Position.h"
    … …  
    123123#endif
    124124
    125 #endif // KHTML_EDITING_VISIBLE_POSITION_H
     125#endif // VisiblePosition_h

  • trunk/WebCore/editing/htmlediting.cpp

    r15226 r15253  
    381381const String& nonBreakingSpaceString()
    382382{
    383     static String nonBreakingSpaceString = DeprecatedString(QChar(NON_BREAKING_SPACE));
     383    static String nonBreakingSpaceString = DeprecatedString(DeprecatedChar(NON_BREAKING_SPACE));
    384384    return nonBreakingSpaceString;
    385385}

  • trunk/WebCore/editing/markup.cpp

    r15185 r15253  
    155155            return static_cast<const ProcessingInstruction*>(node)->toString().deprecatedString();
    156156        case Node::ELEMENT_NODE: {
    157             DeprecatedString markup = QChar('<');
     157            DeprecatedString markup = DeprecatedChar('<');
    158158            const Element* el = static_cast<const Element*>(node);
    159159            markup += el->nodeNamePreservingCase().deprecatedString();

  • trunk/WebCore/editing/markup.h

    r14256 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_MARKUP_H
    27 #define KHTML_EDITING_MARKUP_H
     26#ifndef markup_h
     27#define markup_h
    2828
    2929#include "HTMLInterchange.h"
    … …  
    5353}
    5454
    55 #endif // KHTML_EDITING_MARKUP_H
     55#endif // markup_h

  • trunk/WebCore/editing/visible_units.cpp

    r15226 r15253  
    7373    while (!it.atEnd() && it.length() > 0) {
    7474        // iterate to get chunks until the searchFunction returns a non-zero value.
    75         string.prepend(reinterpret_cast<const QChar*>(it.characters()), it.length());
     75        string.prepend(reinterpret_cast<const DeprecatedChar*>(it.characters()), it.length());
    7676        next = searchFunction(reinterpret_cast<const UChar*>(string.unicode()), string.length());
    7777        if (next != 0)
    … …  
    8989        // by performing an additional check with a modified string which uses an "X"
    9090        // character to stand in for the replaced element.
    91         QChar chars[2];
     91        DeprecatedChar chars[2];
    9292        chars[0] = 'X';
    9393        chars[1] = ' ';
    … …  
    144144        // Keep asking the iterator for chunks until the search function
    145145        // returns an end value not equal to the length of the string passed to it.
    146         string.append(reinterpret_cast<const QChar*>(it.characters()), it.length());
     146        string.append(reinterpret_cast<const DeprecatedChar*>(it.characters()), it.length());
    147147        next = searchFunction(reinterpret_cast<const UChar*>(string.unicode()), string.length());
    148148        if (next != string.length())
    … …  
    161161        // by performing an additional check with a modified string which uses an "X"
    162162        // character to stand in for the replaced element.
    163         QChar chars[2];
     163        DeprecatedChar chars[2];
    164164        chars[0] = ' ';
    165165        chars[1] = 'X';

  • trunk/WebCore/editing/visible_units.h

    r13849 r15253  
    2424 */
    2525
    26 #ifndef KHTML_EDITING_VISIBLE_UNITS_H
    27 #define KHTML_EDITING_VISIBLE_UNITS_H
     26#ifndef visible_units_h
     27#define visible_units_h
    2828
    2929#include "TextAffinity.h"
    … …  
    8888} // namespace WebCore
    8989
    90 #endif // KHTML_EDITING_VISIBLE_POSITION_H
     90#endif // VisiblePosition_h

  • trunk/WebCore/html/HTMLDocument.cpp

    r15247 r15253  
    206206{
    207207    while (true) {
    208         QChar ch = buffer[index];
     208        DeprecatedChar ch = buffer[index];
    209209        if (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')
    210210            ++index;
    … …  
    248248        index = buffer.find('<', index);
    249249        if (index == -1) break;
    250         QChar nextChar = buffer[index+1];
     250        DeprecatedChar nextChar = buffer[index+1];
    251251        if (nextChar == '!') {
    252252            if (containsString("doctype", buffer, index+2)) {
    … …  
    281281        // Now we find the beginning and end of the public identifers
    282282        // and system identifiers (assuming they're even present).
    283         QChar theChar = buffer[index];
     283        DeprecatedChar theChar = buffer[index];
    284284        if (theChar != '\"' && theChar != '\'')
    285285            return false;
    … …  
    292292            return false;
    293293        index = parseDocTypePart(buffer, publicIDEnd+1);
    294         QChar next = buffer[index];
     294        DeprecatedChar next = buffer[index];
    295295        if (next == '>') {
    296296            // Public identifier present, but no system identifier.
    … …  
    323323            *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID;
    324324            index = parseDocTypePart(buffer, index+6);
    325             QChar next = buffer[index];
     325            DeprecatedChar next = buffer[index];
    326326            if (next != '\"' && next != '\'')
    327327                return false;
    … …  
    334334        }
    335335
    336         QChar nextChar = buffer[index];
     336        DeprecatedChar nextChar = buffer[index];
    337337        if (nextChar == '[')
    338338            *resultFlags |= PARSEMODE_HAVE_INTERNAL;

  • trunk/WebCore/html/HTMLFontElement.cpp

    r14345 r15253  
    5050   
    5151    // Skip leading spaces.
    52     while (QChar(s[pos]).isSpace())
     52    while (DeprecatedChar(s[pos]).isSpace())
    5353        ++pos;
    5454   

  • trunk/WebCore/html/HTMLInputElement.cpp

    r15111 r15253  
    4747#include "RenderLineEdit.h"
    4848#include "RenderText.h"
    49 #include "RenderTextField.h"
     49#include "RenderTextControl.h"
    5050#include "RenderTheme.h"
    5151#include "SelectionController.h"
    … …  
    463463            if (document()->focusNode() != this && cachedSelStart >= 0)
    464464                return cachedSelStart;
    465             return static_cast<RenderTextField*>(renderer())->selectionStart();
     465            return static_cast<RenderTextControl*>(renderer())->selectionStart();
    466466    }
    467467    return 0;
    … …  
    491491            if (document()->focusNode() != this && cachedSelEnd >= 0)
    492492                return cachedSelEnd;
    493             return static_cast<RenderTextField*>(renderer())->selectionEnd();
     493            return static_cast<RenderTextControl*>(renderer())->selectionEnd();
    494494    }
    495495    return 0;
    … …  
    518518            break;
    519519        case TEXT:
    520             static_cast<RenderTextField*>(renderer())->setSelectionStart(start);
     520            static_cast<RenderTextControl*>(renderer())->setSelectionStart(start);
    521521            break;
    522522    }
    … …  
    545545            break;
    546546        case TEXT:
    547             static_cast<RenderTextField*>(renderer())->setSelectionEnd(end);
     547            static_cast<RenderTextControl*>(renderer())->setSelectionEnd(end);
    548548            break;
    549549    }
    … …  
    574574            break;
    575575        case TEXT:
    576             static_cast<RenderTextField*>(renderer())->select();
     576            static_cast<RenderTextControl*>(renderer())->select();
    577577            break;
    578578    }
    … …  
    601601            break;
    602602        case TEXT:
    603             static_cast<RenderTextField*>(renderer())->setSelectionRange(start, end);
     603            static_cast<RenderTextControl*>(renderer())->setSelectionRange(start, end);
    604604            break;
    605605    }
    … …  
    825825            return new (arena) DeprecatedSlider(this);
    826826        case TEXT:
    827             return new (arena) RenderTextField(this, false);
     827            return new (arena) RenderTextControl(this, false);
    828828    }
    829829    assert(false);
    … …  
    13611361   
    13621362    if (isNonWidgetTextField() && (evt->isMouseEvent() || evt->isDragEvent() || evt->isWheelEvent() || evt->type() == blurEvent) && renderer())
    1363         static_cast<RenderTextField*>(renderer())->forwardEvent(evt);
     1363        static_cast<RenderTextControl*>(renderer())->forwardEvent(evt);
    13641364   
    13651365    HTMLGenericFormElement::defaultEventHandler(evt);

  • trunk/WebCore/html/HTMLKeygenElement.cpp

    r14680 r15253  
    3333#include "HTMLOptionElement.h"
    3434#include "KURL.h"
    35 #include "KWQKSSLKeyGen.h"
     35#include "SSLKeyGenerator.h"
    3636#include "Text.h"
    3737
    … …  
    4545    : HTMLSelectElement(keygenTag, doc, f)
    4646{
    47     DeprecatedStringList keys = KSSLKeyGen::supportedKeySizes();
     47    DeprecatedStringList keys = SSLKeyGenerator::supportedKeySizes();
    4848    for (DeprecatedStringList::Iterator i = keys.begin(); i != keys.end(); ++i) {
    4949        HTMLOptionElement* o = new HTMLOptionElement(doc, form());
    … …  
    7575    if (!m_keyType.isNull() && !equalIgnoringCase(m_keyType, "rsa"))
    7676        return false;
    77     DeprecatedString value = KSSLKeyGen::signedPublicKeyAndChallengeString(selectedIndex(), m_challenge.deprecatedString(), document()->baseURL());
     77    DeprecatedString value = SSLKeyGenerator::signedPublicKeyAndChallengeString(selectedIndex(), m_challenge.deprecatedString(), document()->baseURL());
    7878    if (value.isNull())
    7979        return false;

  • trunk/WebCore/html/HTMLSelectElement.h

    r15196 r15253  
    2929#include "HTMLGenericFormElement.h"
    3030#include "HTMLCollection.h"
    31 #include "render_style.h"
     31#include "RenderStyle.h"
    3232#include <wtf/Vector.h>
    3333

  • trunk/WebCore/html/HTMLTextAreaElement.cpp

    r14935 r15253  
    3535#include "HTMLNames.h"
    3636#include "RenderTextArea.h"
    37 #include "RenderTextField.h"
     37#include "RenderTextControl.h"
    3838#include "Text.h"
    39 #include "render_style.h"
     39#include "RenderStyle.h"
    4040
    4141namespace WebCore {
    … …  
    8282        if (document()->focusNode() != this && cachedSelStart >= 0)
    8383            return cachedSelStart;
    84         return static_cast<RenderTextField *>(renderer())->selectionStart();
     84        return static_cast<RenderTextControl *>(renderer())->selectionStart();
    8585    }
    8686    return 0;
    … …  
    9292        if (document()->focusNode() != this && cachedSelEnd >= 0)
    9393            return cachedSelEnd;
    94         return static_cast<RenderTextField *>(renderer())->selectionEnd();
     94        return static_cast<RenderTextControl *>(renderer())->selectionEnd();
    9595    }
    9696    return 0;
    … …  
    100100{
    101101    if (renderer())
    102         static_cast<RenderTextField*>(renderer())->setSelectionStart(start);
     102        static_cast<RenderTextControl*>(renderer())->setSelectionStart(start);
    103103}
    104104
    … …  
    106106{
    107107    if (renderer())
    108         static_cast<RenderTextField*>(renderer())->setSelectionEnd(end);
     108        static_cast<RenderTextControl*>(renderer())->setSelectionEnd(end);
    109109}
    110110
    … …  
    112112{
    113113    if (renderer())
    114         static_cast<RenderTextField *>(renderer())->select();
     114        static_cast<RenderTextControl *>(renderer())->select();
    115115}
    116116
    … …  
    118118{
    119119    if (renderer())
    120         static_cast<RenderTextField*>(renderer())->setSelectionRange(start, end);
     120        static_cast<RenderTextControl*>(renderer())->setSelectionRange(start, end);
    121121}
    122122
    … …  
    165165RenderObject* HTMLTextAreaElement::createRenderer(RenderArena* arena, RenderStyle* style)
    166166{
    167     return new (arena) RenderTextField(this, true);
     167    return new (arena) RenderTextControl(this, true);
    168168}
    169169
    … …  
    174174       
    175175    bool hardWrap = renderer() && wrap() == ta_Physical;
    176     String v = hardWrap ? static_cast<RenderTextField*>(renderer())->textWithHardLineBreaks() : value();
     176    String v = hardWrap ? static_cast<RenderTextControl*>(renderer())->textWithHardLineBreaks() : value();
    177177    encoding.appendData(name(), v);
    178178    return true;
    … …  
    211211            // If this is the first focus, set a caret at the end of the text. 
    212212            // This matches other browsers' behavior.
    213             int max = static_cast<RenderTextField*>(renderer())->text().length();
     213            int max = static_cast<RenderTextControl*>(renderer())->text().length();
    214214            setSelectionRange(max, max);
    215215        } else
    … …  
    227227{
    228228    if (renderer() && (evt->isMouseEvent() || evt->isDragEvent() || evt->isWheelEvent() || evt->type() == blurEvent))
    229         static_cast<RenderTextField*>(renderer())->forwardEvent(evt);
     229        static_cast<RenderTextControl*>(renderer())->forwardEvent(evt);
    230230
    231231    HTMLGenericFormElement::defaultEventHandler(evt);
    … …  
    241241    if (!valueMatchesRenderer()) {
    242242        ASSERT(renderer());
    243         m_value = static_cast<RenderTextField*>(renderer())->text();
     243        m_value = static_cast<RenderTextControl*>(renderer())->text();
    244244        setValueMatchesRenderer();
    245245    }

  • trunk/WebCore/html/HTMLTextFieldInnerElement.cpp

    r14451 r15253  
    3131#include "HTMLInputElement.h"
    3232#include "HTMLTextAreaElement.h"
    33 #include "RenderTextField.h"
     33#include "RenderTextControl.h"
    3434
    3535namespace WebCore {
    … …  
    5454                static_cast<HTMLTextAreaElement*>(shadowParentNode())->defaultEventHandler(evt);
    5555        if (evt->type() == khtmlEditableContentChangedEvent)
    56             static_cast<RenderTextField*>(shadowParentNode()->renderer())->subtreeHasChanged();
     56            static_cast<RenderTextControl*>(shadowParentNode()->renderer())->subtreeHasChanged();
    5757    }
    5858    HTMLDivElement::defaultEventHandler(evt);

  • trunk/WebCore/html/HTMLTokenizer.cpp

    r15247 r15253  
    389389
    390390    state = processListing(SegmentedString(scriptCode, scriptCodeSize), state);
    391     DeprecatedString exScript(reinterpret_cast<QChar*>(buffer), dest - buffer);
     391    DeprecatedString exScript(reinterpret_cast<DeprecatedChar*>(buffer), dest - buffer);
    392392    processToken();
    393393    currToken.tagName = scriptTag.localName();
    … …  
    15471547        DeprecatedString food;
    15481548        if (m_state.inScript() || m_state.inStyle())
    1549             food.setUnicode(reinterpret_cast<QChar*>(scriptCode), scriptCodeSize);
     1549            food.setUnicode(reinterpret_cast<DeprecatedChar*>(scriptCode), scriptCodeSize);
    15501550        else if (m_state.inServer()) {
    15511551            food = "<";
    1552             food += DeprecatedString(reinterpret_cast<QChar*>(scriptCode), scriptCodeSize);
     1552            food += DeprecatedString(reinterpret_cast<DeprecatedChar*>(scriptCode), scriptCodeSize);
    15531553        } else {
    1554             pos = QConstString(reinterpret_cast<QChar*>(scriptCode), scriptCodeSize).string().find('>');
    1555             food.setUnicode(reinterpret_cast<QChar*>(scriptCode) + pos + 1, scriptCodeSize - pos - 1); // deep copy
     1554            pos = DeprecatedConstString(reinterpret_cast<DeprecatedChar*>(scriptCode), scriptCodeSize).string().find('>');
     1555            food.setUnicode(reinterpret_cast<DeprecatedChar*>(scriptCode) + pos + 1, scriptCodeSize - pos - 1); // deep copy
    15561556        }
    15571557        fastFree(scriptCode);
    … …  
    15781578#ifdef TOKEN_DEBUG
    15791579        if(currToken.tagName.length()) {
    1580             qDebug( "unexpected token: %s, str: *%s*", currToken.tagName.deprecatedString().latin1(),QConstString( buffer,dest-buffer ).deprecatedString().latin1() );
     1580            qDebug( "unexpected token: %s, str: *%s*", currToken.tagName.deprecatedString().latin1(),DeprecatedConstString( buffer,dest-buffer ).deprecatedString().latin1() );
    15811581            ASSERT(0);
    15821582        }
    … …  
    15991599    DeprecatedString text;
    16001600    if(currToken.text)
    1601         text = QConstString(currToken.text->unicode(), currToken.text->length()).deprecatedString();
     1601        text = DeprecatedConstString(currToken.text->unicode(), currToken.text->length()).deprecatedString();
    16021602
    16031603    kdDebug( 6036 ) << "Token --> " << name << endl;

  • trunk/WebCore/html/HTMLTokenizer.h

    r15134 r15253  
    2727#define HTMLTOKENIZER_H
    2828
    29 #include "KWQPtrQueue.h"
     29#include "DeprecatedPtrQueue.h"
    3030#include "NamedMappedAttrMap.h"
    3131#include "SegmentedString.h"
    3232#include "Timer.h"
    33 #include "xml_tokenizer.h"
     33#include "XMLTokenizer.h"
    3434#include "CachedObjectClient.h"
    3535

  • trunk/WebCore/kcanvas/KCanvasCreator.cpp

    r13821 r15253  
    2828
    2929#include "KRenderingDevice.h"
    30 #include "KCanvasContainer.h"
     30#include "RenderSVGContainer.h"
    3131
    3232namespace WebCore {

  • trunk/WebCore/kcanvas/KCanvasFilters.cpp

    r14256 r15253  
    2828#include "CachedImage.h"
    2929
    30 #include "KWQTextStream.h"
     30#include "TextStream.h"
    3131#include "KCanvasTreeDebug.h"
    3232#include <wtf/Assertions.h>
    … …  
    6767}
    6868
    69 QTextStream &KCanvasFilter::externalRepresentation(QTextStream &ts) const
     69TextStream &KCanvasFilter::externalRepresentation(TextStream &ts) const
    7070{
    7171    ts << "[type=FILTER] "
    … …  
    8888}
    8989
    90 QTextStream &operator<<(QTextStream &ts, const KCanvasFilterEffect &e)
     90TextStream &operator<<(TextStream &ts, const KCanvasFilterEffect &e)
    9191{
    9292    return e.externalRepresentation(ts);
    … …  
    122122}
    123123
    124 static QTextStream &operator<<(QTextStream &ts, const KCanvasPoint3F p)
     124static TextStream &operator<<(TextStream &ts, const KCanvasPoint3F p)
    125125{
    126126    ts << "x=" << p.x() << " y=" << p.y() << " z=" << p.z();
    … …  
    128128}
    129129
    130 QTextStream &KCanvasFilterEffect::externalRepresentation(QTextStream &ts) const
     130TextStream &KCanvasFilterEffect::externalRepresentation(TextStream &ts) const
    131131{
    132132    if (!in().isEmpty())
    … …  
    139139}
    140140
    141 QTextStream &KCPointLightSource::externalRepresentation(QTextStream &ts) const
     141TextStream &KCPointLightSource::externalRepresentation(TextStream &ts) const
    142142{
    143143    ts << "[type=POINT-LIGHT] ";
    … …  
    146146}
    147147
    148 QTextStream &KCSpotLightSource::externalRepresentation(QTextStream &ts) const
     148TextStream &KCSpotLightSource::externalRepresentation(TextStream &ts) const
    149149{
    150150    ts << "[type=SPOT-LIGHT] ";
    … …  
    156156}
    157157
    158 QTextStream &KCDistantLightSource::externalRepresentation(QTextStream &ts) const
     158TextStream &KCDistantLightSource::externalRepresentation(TextStream &ts) const
    159159{
    160160    ts << "[type=DISTANT-LIGHT] ";
    … …  
    164164}
    165165
    166 static QTextStream &operator<<(QTextStream &ts, KCBlendModeType t)
     166static TextStream &operator<<(TextStream &ts, KCBlendModeType t)
    167167{
    168168    switch (t)
    … …  
    182182}
    183183
    184 QTextStream &KCanvasFEBlend::externalRepresentation(QTextStream &ts) const
     184TextStream &KCanvasFEBlend::externalRepresentation(TextStream &ts) const
    185185{
    186186    ts << "[type=BLEND] ";
    … …  
    192192}
    193193
    194 static QTextStream &operator<<(QTextStream &ts, KCColorMatrixType t)
     194static TextStream &operator<<(TextStream &ts, KCColorMatrixType t)
    195195{
    196196    switch (t)
    … …  
    208208}
    209209
    210 QTextStream &KCanvasFEColorMatrix::externalRepresentation(QTextStream &ts) const
     210TextStream &KCanvasFEColorMatrix::externalRepresentation(TextStream &ts) const
    211211{
    212212    ts << "[type=COLOR-MATRIX] ";
    … …  
    217217}
    218218
    219 static QTextStream &operator<<(QTextStream &ts, KCComponentTransferType t)
     219static TextStream &operator<<(TextStream &ts, KCComponentTransferType t)
    220220{
    221221    switch (t)
    … …  
    235235}
    236236
    237 static QTextStream &operator<<(QTextStream &ts, const KCComponentTransferFunction &func)
     237static TextStream &operator<<(TextStream &ts, const KCComponentTransferFunction &func)
    238238{
    239239    ts << "[type=" << func.type << "]";
    … …  
    266266}
    267267
    268 QTextStream &KCanvasFEComponentTransfer::externalRepresentation(QTextStream &ts) const
     268TextStream &KCanvasFEComponentTransfer::externalRepresentation(TextStream &ts) const
    269269{
    270270    ts << "[type=COMPONENT-TRANSFER] ";
    … …  
    277277}
    278278
    279 QTextStream &KCanvasFEComposite::externalRepresentation(QTextStream &ts) const
     279TextStream &KCanvasFEComposite::externalRepresentation(TextStream &ts) const
    280280{
    281281    ts << "[type=COMPOSITE] ";
    … …  
    287287}
    288288
    289 static QTextStream &operator<<(QTextStream &ts, KCEdgeModeType t)
     289static TextStream &operator<<(TextStream &ts, KCEdgeModeType t)
    290290{   
    291291    switch (t)
    … …  
    301301}
    302302
    303 QTextStream &KCanvasFEConvolveMatrix::externalRepresentation(QTextStream &ts) const
     303TextStream &KCanvasFEConvolveMatrix::externalRepresentation(TextStream &ts) const
    304304{
    305305    ts << "[type=CONVOLVE-MATRIX] ";
    … …  
    332332}
    333333
    334 QTextStream &KCanvasFEDiffuseLighting::externalRepresentation(QTextStream &ts) const
     334TextStream &KCanvasFEDiffuseLighting::externalRepresentation(TextStream &ts) const
    335335{
    336336    ts << "[type=DIFFUSE-LIGHTING] ";
    … …  
    342342}
    343343
    344 static QTextStream &operator<<(QTextStream &ts, KCChannelSelectorType t)
     344static TextStream &operator<<(TextStream &ts, KCChannelSelectorType t)
    345345{
    346346    switch (t)
    … …  
    358358}
    359359
    360 QTextStream &KCanvasFEDisplacementMap::externalRepresentation(QTextStream &ts) const
     360TextStream &KCanvasFEDisplacementMap::externalRepresentation(TextStream &ts) const
    361361{
    362362    ts << "[type=DISPLACEMENT-MAP] ";
    … …  
    370370}
    371371
    372 QTextStream &KCanvasFEFlood::externalRepresentation(QTextStream &ts) const
     372TextStream &KCanvasFEFlood::externalRepresentation(TextStream &ts) const
    373373{
    374374    ts << "[type=FLOOD] ";
    … …  
    399399}
    400400
    401 QTextStream &KCanvasFEGaussianBlur::externalRepresentation(QTextStream &ts) const
     401TextStream &KCanvasFEGaussianBlur::externalRepresentation(TextStream &ts) const
    402402{
    403403    ts << "[type=GAUSSIAN-BLUR] ";
    … …  
    407407}
    408408
    409 QTextStream &KCanvasFEImage::externalRepresentation(QTextStream &ts) const
     409TextStream &KCanvasFEImage::externalRepresentation(TextStream &ts) const
    410410{
    411411    ts << "[type=IMAGE] ";
    … …  
    415415}
    416416
    417 QTextStream &KCanvasFEMerge::externalRepresentation(QTextStream &ts) const
     417TextStream &KCanvasFEMerge::externalRepresentation(TextStream &ts) const
    418418{
    419419    ts << "[type=MERGE] ";
    … …  
    423423}
    424424
    425 static QTextStream &operator<<(QTextStream &ts, KCMorphologyOperatorType t)
     425static TextStream &operator<<(TextStream &ts, KCMorphologyOperatorType t)
    426426{
    427427    switch (t)
    … …  
    435435}
    436436
    437 QTextStream &KCanvasFEMorphology::externalRepresentation(QTextStream &ts) const
     437TextStream &KCanvasFEMorphology::externalRepresentation(TextStream &ts) const
    438438{
    439439    ts << "[type=MORPHOLOGY-OPERATOR] ";
    … …  
    444444}
    445445
    446 QTextStream &KCanvasFEOffset::externalRepresentation(QTextStream &ts) const
     446TextStream &KCanvasFEOffset::externalRepresentation(TextStream &ts) const
    447447{
    448448    ts << "[type=OFFSET] "; KCanvasFilterEffect::externalRepresentation(ts)
    … …  
    451451}
    452452
    453 QTextStream &KCanvasFESpecularLighting::externalRepresentation(QTextStream &ts) const
     453TextStream &KCanvasFESpecularLighting::externalRepresentation(TextStream &ts) const
    454454{
    455455    ts << "[type=SPECULAR-LIGHTING] ";
    … …  
    463463#if 0
    464464///FIXME: KCanvasFETile doesn't have any properties
    465 QTextStream &KCanvasFETile::externalRepresentation(QTextStream &ts) const
     465TextStream &KCanvasFETile::externalRepresentation(TextStream &ts) const
    466466{
    467467   KCanvasFilterEffect::externalRepresentation(ts);
    … …  
    470470#endif
    471471
    472 static QTextStream &operator<<(QTextStream &ts, KCTurbulanceType t)
     472static TextStream &operator<<(TextStream &ts, KCTurbulanceType t)
    473473{
    474474    switch (t)
    … …  
    482482}
    483483
    484 QTextStream &KCanvasFETurbulence::externalRepresentation(QTextStream &ts) const
     484TextStream &KCanvasFETurbulence::externalRepresentation(TextStream &ts) const
    485485{
    486486    ts << "[type=TURBULENCE] ";

  • trunk/WebCore/kcanvas/KCanvasFilters.h

    r14407 r15253  
    113113    virtual void applyFilter(const FloatRect &bbox) = 0;
    114114
    115     QTextStream &externalRepresentation(QTextStream &) const;
     115    TextStream &externalRepresentation(TextStream &) const;
    116116
    117117protected:
    … …  
    146146#endif
    147147
    148     virtual QTextStream &externalRepresentation(QTextStream &) const;
     148    virtual TextStream &externalRepresentation(TextStream &) const;
    149149
    150150private:
    … …  
    154154};
    155155
    156 QTextStream &operator<<(QTextStream &, const KCanvasFilterEffect &);
     156TextStream &operator<<(TextStream &, const KCanvasFilterEffect &);
    157157
    158158typedef enum {
    … …  
    173173    void setBlendMode(KCBlendModeType mode) { m_mode = mode; }
    174174
    175     QTextStream &externalRepresentation(QTextStream &) const;
     175    TextStream &externalRepresentation(TextStream &) const;
    176176
    177177private:
    … …  
    196196    void setValues(const DeprecatedValueList<float> &values) { m_values = values; };
    197197
    198     QTextStream &externalRepresentation(QTextStream &) const;
     198    TextStream &externalRepresentation(TextStream &) const;
    199199
    200200private:
    … …  
    238238    void setAlphaFunction(const KCComponentTransferFunction& func) { m_alphaFunc = func; }
    239239
    240     QTextStream& externalRepresentation(QTextStream&) const;
     240    TextStream& externalRepresentation(TextStream&) const;
    241241
    242242private:
    … …  
    274274    void setK4(float k4) { m_k4 = k4; }
    275275
    276     QTextStream &externalRepresentation(QTextStream &) const;
     276    TextStream &externalRepresentation(TextStream &) const;
    277277
    278278private:
    … …  
    320320    void setPreserveAlpha(bool preserveAlpha) { m_preserveAlpha = preserveAlpha; }
    321321
    322     QTextStream &externalRepresentation(QTextStream &) const;
     322    TextStream &externalRepresentation(TextStream &) const;
    323323
    324324private:
    … …  
    349349    KCLightType type() const { return m_type; }
    350350   
    351     virtual QTextStream &externalRepresentation(QTextStream &) const = 0;
     351    virtual TextStream &externalRepresentation(TextStream &) const = 0;
    352352   
    353353private:
    … …  
    364364    float elevation() const{ return m_elevation; }
    365365   
    366     virtual QTextStream &externalRepresentation(QTextStream &) const;
     366    virtual TextStream &externalRepresentation(TextStream &) const;
    367367   
    368368private:
    … …  
    378378    const KCanvasPoint3F& position() const { return m_position; }
    379379   
    380     virtual QTextStream &externalRepresentation(QTextStream &) const;
     380    virtual TextStream &externalRepresentation(TextStream &) const;
    381381
    382382private:
    … …  
    396396    float limitingConeAngle() const { return m_limitingConeAngle; }
    397397   
    398     virtual QTextStream &externalRepresentation(QTextStream &) const;
     398    virtual TextStream &externalRepresentation(TextStream &) const;
    399399private:
    400400    KCanvasPoint3F m_position;
    … …  
    428428    void setLightSource(KCLightSource *lightSource);
    429429   
    430     QTextStream &externalRepresentation(QTextStream &) const;
     430    TextStream &externalRepresentation(TextStream &) const;
    431431
    432432private:
    … …  
    463463    void setScale(float scale) { m_scale = scale; }
    464464   
    465     QTextStream &externalRepresentation(QTextStream &) const;
     465    TextStream &externalRepresentation(TextStream &) const;
    466466   
    467467private:
    … …  
    481481    void setFloodOpacity(float floodOpacity) { m_floodOpacity = floodOpacity; }
    482482
    483     QTextStream &externalRepresentation(QTextStream &) const;
     483    TextStream &externalRepresentation(TextStream &) const;
    484484
    485485private:
    … …  
    497497    void setStdDeviationY(float y);
    498498
    499     QTextStream &externalRepresentation(QTextStream &) const;
     499    TextStream &externalRepresentation(TextStream &) const;
    500500
    501501private:
    … …  
    515515    void setCachedImage(CachedImage* image);
    516516
    517     QTextStream &externalRepresentation(QTextStream &) const;
     517    TextStream &externalRepresentation(TextStream &) const;
    518518   
    519519private:
    … …  
    527527    void setMergeInputs(const DeprecatedStringList &mergeInputs) { m_mergeInputs = mergeInputs; }
    528528
    529     QTextStream &externalRepresentation(QTextStream &) const;
     529    TextStream &externalRepresentation(TextStream &) const;
    530530   
    531531private:
    … …  
    550550    void setRadiusY(float radiusY) { m_radiusY = radiusY; }
    551551   
    552     QTextStream &externalRepresentation(QTextStream &) const;
     552    TextStream &externalRepresentation(TextStream &) const;
    553553   
    554554private:
    … …  
    567567    void setDy(float dy) { m_dy = dy; }
    568568   
    569     QTextStream &externalRepresentation(QTextStream &) const;
     569    TextStream &externalRepresentation(TextStream &) const;
    570570   
    571571private:
    … …  
    601601    void setLightSource(KCLightSource *lightSource);
    602602   
    603     QTextStream &externalRepresentation(QTextStream &) const;
     603    TextStream &externalRepresentation(TextStream &) const;
    604604   
    605605private:
    … …  
    641641    void setStitchTiles(bool stitch) { m_stitchTiles = stitch; }
    642642
    643     QTextStream &externalRepresentation(QTextStream &) const;
     643    TextStream &externalRepresentation(TextStream &) const;
    644644   
    645645private:

  • trunk/WebCore/kcanvas/KCanvasMatrix.cpp

    r13858 r15253  
    2626
    2727#include "KCanvasPath.h"
    28 #include "KWQWMatrix.h"
     28#include "AffineTransform.h"
    2929#include <math.h>
    3030
    … …  
    3939}
    4040
    41 KCanvasMatrix::KCanvasMatrix(const QMatrix &qmatrix)
    42 {
    43     m_mode = OPS_PREMUL;
    44     (*this) = qmatrix;
     41KCanvasMatrix::KCanvasMatrix(const AffineTransform &matrix)
     42{
     43    m_mode = OPS_PREMUL;
     44    (*this) = matrix;
    4545}
    4646
    … …  
    6161}
    6262
    63 KCanvasMatrix &KCanvasMatrix::operator=(const QMatrix &other)
     63KCanvasMatrix &KCanvasMatrix::operator=(const AffineTransform &other)
    6464{
    6565    m_matrix = other;
    … …  
    7373}
    7474
    75 bool KCanvasMatrix::operator==(const QMatrix &other) const
     75bool KCanvasMatrix::operator==(const AffineTransform &other) const
    7676{
    7777    return (m_matrix == other);
    7878}
    7979
    80 bool KCanvasMatrix::operator!=(const QMatrix &other) const
     80bool KCanvasMatrix::operator!=(const AffineTransform &other) const
    8181{
    8282    return !operator==(other);
    … …  
    164164    else
    165165    {
    166         QMatrix temp;
     166        AffineTransform temp;
    167167        temp.translate(x, y);
    168168        m_matrix *= temp;
    … …  
    174174KCanvasMatrix &KCanvasMatrix::multiply(const KCanvasMatrix &other)
    175175{
    176     QMatrix temp(other.a(), other.b(), other.c(), other.d(), other.e(), other.f());
     176    AffineTransform temp(other.a(), other.b(), other.c(), other.d(), other.e(), other.f());
    177177
    178178    if(m_mode == OPS_PREMUL)
    … …  
    193193    else
    194194    {
    195         QMatrix temp;
     195        AffineTransform temp;
    196196        temp.scale(scaleFactorX, scaleFactorY);
    197197        m_matrix *= temp;
    … …  
    207207    else
    208208    {
    209         QMatrix temp;
     209        AffineTransform temp;
    210210        temp.rotate(angle);
    211211        m_matrix *= temp;
    … …  
    221221    else
    222222    {
    223         QMatrix temp;
     223        AffineTransform temp;
    224224        temp.rotate(atan2(y, x) / deg2rad);
    225225        m_matrix *= temp;
    … …  
    245245    else
    246246    {
    247         QMatrix temp;
     247        AffineTransform temp;
    248248        temp.shear(tan(angle * deg2rad), 0.0f);
    249249        m_matrix *= temp;
    … …  
    259259    else
    260260    {
    261         QMatrix temp;
     261        AffineTransform temp;
    262262        temp.shear(0.0f, tan(angle * deg2rad));
    263263        m_matrix *= temp;
    … …  
    284284}
    285285
    286 QMatrix KCanvasMatrix::qmatrix() const
     286AffineTransform KCanvasMatrix::matrix() const
    287287{
    288288    return m_matrix;

  • trunk/WebCore/kcanvas/KCanvasMatrix.h

    r13858 r15253  
    2525#if SVG_SUPPORT
    2626
    27 #include "KWQWMatrix.h"
     27#include "AffineTransform.h"
    2828
    2929namespace WebCore {
    … …  
    3939public:
    4040    KCanvasMatrix();
    41     KCanvasMatrix(const QMatrix &qmatrix);
     41    KCanvasMatrix(const AffineTransform &matrix);
    4242    KCanvasMatrix(const KCanvasMatrix &matrix);
    4343    KCanvasMatrix(double a, double b, double c, double d, double e, double f);
    … …  
    4545
    4646    // Operators
    47     KCanvasMatrix &operator=(const QMatrix &other);
     47    KCanvasMatrix &operator=(const AffineTransform &other);
    4848    KCanvasMatrix &operator=(const KCanvasMatrix &other);
    4949
    50     bool operator==(const QMatrix &other) const;
    51     bool operator!=(const QMatrix &other) const;
     50    bool operator==(const AffineTransform &other) const;
     51    bool operator!=(const AffineTransform &other) const;
    5252
    5353    bool operator==(const KCanvasMatrix &other) const;
    … …  
    9595    void removeScale(double *xScale, double *yScale);
    9696
    97     QMatrix qmatrix() const;
     97    AffineTransform matrix() const;
    9898
    9999private:
    100     QMatrix m_matrix;
     100    AffineTransform m_matrix;
    101101    KCMatrixOperationMode m_mode;
    102102};

  • trunk/WebCore/kcanvas/KCanvasPath.cpp

    r13858 r15253  
    2727#if SVG_SUPPORT
    2828
    29 #include "KWQTextStream.h"
     29#include "TextStream.h"
    3030
    3131#include "KCanvasPath.h"
    … …  
    3636
    3737//KCWindRule
    38 QTextStream &operator<<(QTextStream &ts, KCWindRule rule)
     38TextStream &operator<<(TextStream &ts, KCWindRule rule)
    3939{
    4040    switch (rule)
    … …  
    4949
    5050//KCClipData
    51 QTextStream &operator<<(QTextStream &ts, const KCClipData &d)
     51TextStream &operator<<(TextStream &ts, const KCClipData &d)
    5252{
    5353    ts << "[winding=" << d.windRule() << "]";

  • trunk/WebCore/kcanvas/KCanvasPath.h

    r14407 r15253  
    3131#include "FloatRect.h"
    3232
    33 class QTextStream;
     33class TextStream;
    3434
    3535namespace WebCore {
    … …  
    9595};
    9696
    97 QTextStream &operator<<(QTextStream &ts, KCWindRule rule);
    98 QTextStream &operator<<(QTextStream &ts, const KCClipData &d);
     97TextStream &operator<<(TextStream &ts, KCWindRule rule);
     98TextStream &operator<<(TextStream &ts, const KCClipData &d);
    9999
    100100}

  • trunk/WebCore/kcanvas/KCanvasResources.cpp

    r13992 r15253  
    2828#include "GraphicsContext.h"
    2929#include "IntRect.h"
    30 #include "KCanvasContainer.h"
     30#include "RenderSVGContainer.h"
    3131#include "KCanvasImage.h"
    3232#include "KCanvasMatrix.h"
    … …  
    3535#include "RenderPath.h"
    3636#include "SVGStyledElement.h"
    37 #include "KWQTextStream.h"
     37#include "TextStream.h"
    3838
    3939namespace WebCore {
    4040
    41 QTextStream &operator<<(QTextStream &ts, const WebCore::KCanvasResource &r)
     41TextStream &operator<<(TextStream &ts, const WebCore::KCanvasResource &r)
    4242{
    4343    return r.externalRepresentation(ts);
    … …  
    8585}
    8686
    87 QTextStream& KCanvasResource::externalRepresentation(QTextStream &ts) const
     87TextStream& KCanvasResource::externalRepresentation(TextStream &ts) const
    8888{
    8989    return ts;
    … …  
    114114}
    115115
    116 QTextStream& KCanvasClipper::externalRepresentation(QTextStream &ts) const
     116TextStream& KCanvasClipper::externalRepresentation(TextStream &ts) const
    117117{
    118118    ts << "[type=CLIPPER]";
    … …  
    139139}
    140140
    141 QTextStream& KCanvasMasker::externalRepresentation(QTextStream &ts) const
     141TextStream& KCanvasMasker::externalRepresentation(TextStream &ts) const
    142142{
    143143    ts << "[type=MASKER]";
    … …  
    241241        // FIXME: bounding box fractions lost
    242242        RenderObject::PaintInfo info(context, enclosingIntRect(rect), PaintPhaseForeground, 0, 0);
    243         m_marker->setLocalTransform(rotation.multiply(translation).qmatrix());
    244         static_cast<KCanvasContainer *>(m_marker)->setDrawsContents(true);
     243        m_marker->setLocalTransform(rotation.multiply(translation).matrix());
     244        static_cast<RenderSVGContainer *>(m_marker)->setDrawsContents(true);
    245245        m_marker->paint(info, 0, 0);
    246         static_cast<KCanvasContainer *>(m_marker)->setDrawsContents(false);
     246        static_cast<RenderSVGContainer *>(m_marker)->setDrawsContents(false);
    247247    }
    248248}
    249249
    250 QTextStream& KCanvasMarker::externalRepresentation(QTextStream &ts) const
     250TextStream& KCanvasMarker::externalRepresentation(TextStream &ts) const
    251251{
    252252    ts << "[type=MARKER]"

  • trunk/WebCore/kcanvas/KCanvasResources.h

    r13992 r15253  
    2929#include <kcanvas/KCanvasResourceListener.h>
    3030
    31 class QTextStream;
     31class TextStream;
    3232
    3333namespace WebCore {
    … …  
    6767    virtual bool isMasker() const { return false; }
    6868   
    69     virtual QTextStream& externalRepresentation(QTextStream &) const;
     69    virtual TextStream& externalRepresentation(TextStream &) const;
    7070private:
    7171    KCanvasItemList m_clients;
    … …  
    8888    KCClipDataList clipData() const;
    8989
    90     QTextStream& externalRepresentation(QTextStream &) const;
     90    TextStream& externalRepresentation(TextStream &) const;
    9191protected:
    9292    KCClipDataList m_clipData;
    … …  
    107107    virtual void applyMask(const FloatRect& boundingBox) const = 0;
    108108
    109     QTextStream& externalRepresentation(QTextStream &) const;
     109    TextStream& externalRepresentation(TextStream &) const;
    110110protected:
    111111    KCanvasImage *m_mask;
    … …  
    139139    void draw(GraphicsContext*, const FloatRect&, double x, double y, double strokeWidth = 1, double angle = 0);
    140140
    141     QTextStream& externalRepresentation(QTextStream &) const;
     141    TextStream& externalRepresentation(TextStream &) const;
    142142
    143143private:
    … …  
    154154KRenderingPaintServer *getPaintServerById(Document *document, const AtomicString &id);
    155155
    156 QTextStream &operator<<(QTextStream &ts, const KCanvasResource &r);
     156TextStream &operator<<(TextStream &ts, const KCanvasResource &r);
    157157
    158158}

  • trunk/WebCore/kcanvas/KCanvasTreeDebug.cpp

    r13821 r15253  
    3232#include "HTMLNames.h"
    3333#include "RenderTreeAsText.h"
    34 #include <kcanvas/KCanvasContainer.h>
     34#include <kcanvas/RenderSVGContainer.h>
    3535#include <kcanvas/device/KRenderingDevice.h>
    3636#include <kcanvas/device/KRenderingFillPainter.h>
    … …  
    4949 * DeprecatedStringList::join for streams
    5050 */
    51 class QTextStreamSeparator
     51class TextStreamSeparator
    5252{
    5353public:
    54     QTextStreamSeparator(const DeprecatedString &s) : m_separator(s), m_needToSeparate(false) {}
     54    TextStreamSeparator(const DeprecatedString &s) : m_separator(s), m_needToSeparate(false) {}
    5555private:
    56     friend QTextStream& operator<<(QTextStream &ts, QTextStreamSeparator &sep);
     56    friend TextStream& operator<<(TextStream &ts, TextStreamSeparator &sep);
    5757   
    5858private:
    … …  
    6161};
    6262
    63 QTextStream& operator<<(QTextStream &ts, QTextStreamSeparator &sep)
     63TextStream& operator<<(TextStream &ts, TextStreamSeparator &sep)
    6464{
    6565    if (sep.m_needToSeparate)
    … …  
    7070}
    7171
    72 QTextStream &operator<<(QTextStream &ts, const IntPoint &p)
     72TextStream &operator<<(TextStream &ts, const IntPoint &p)
    7373{
    7474    return ts << "(" << p.x() << "," << p.y() << ")";
    7575}
    7676
    77 QTextStream &operator<<(QTextStream &ts, const IntRect &r)
     77TextStream &operator<<(TextStream &ts, const IntRect &r)
    7878{
    7979    return ts << "at (" << r.x() << "," << r.y() << ") size " << r.width() << "x" << r.height();
    … …  
    8888}
    8989
    90 QTextStream &operator<<(QTextStream &ts, const FloatRect &r)
     90TextStream &operator<<(TextStream &ts, const FloatRect &r)
    9191{
    9292    ts << "at (";
    … …  
    113113}
    114114
    115 QTextStream &operator<<(QTextStream &ts, const FloatPoint &p)
     115TextStream &operator<<(TextStream &ts, const FloatPoint &p)
    116116{
    117117    ts << "(";   
    … …  
    128128}
    129129
    130 QTextStream &operator<<(QTextStream &ts, const FloatSize &s)
     130TextStream &operator<<(TextStream &ts, const FloatSize &s)
    131131{   
    132132    ts << "width=";
    … …  
    144144
    145145
    146 QTextStream &operator<<(QTextStream &ts, const QMatrix &m)
     146TextStream &operator<<(TextStream &ts, const AffineTransform &m)
    147147{
    148148    if (m.isIdentity())
    … …  
    156156}
    157157
    158 QTextStream &operator<<(QTextStream &ts, const Color &c)
     158TextStream &operator<<(TextStream &ts, const Color &c)
    159159{
    160160    return ts << c.name();
    161161}
    162162
    163 static void writeIndent(QTextStream &ts, int indent)
     163static void writeIndent(TextStream &ts, int indent)
    164164{
    165165    for (int i = 0; i != indent; ++i) {
    … …  
    169169
    170170//FIXME: This should be in KRenderingStyle.cpp
    171 static QTextStream &operator<<(QTextStream &ts, const KCDashArray &a)
     171static TextStream &operator<<(TextStream &ts, const KCDashArray &a)
    172172{
    173173    ts << "{";
    … …  
    182182
    183183//FIXME: This should be in KRenderingStyle.cpp
    184 static QTextStream &operator<<(QTextStream &ts, KCCapStyle style)
     184static TextStream &operator<<(TextStream &ts, KCCapStyle style)
    185185{
    186186    switch (style) {
    … …  
    196196
    197197//FIXME: This should be in KRenderingStyle.cpp
    198 static QTextStream &operator<<(QTextStream &ts, KCJoinStyle style)
     198static TextStream &operator<<(TextStream &ts, KCJoinStyle style)
    199199{
    200200    switch (style) {
    … …  
    214214#define DIFFERS_FROM_PARENT_AVOID_TEST_IF_FALSE(pred, path) (!parentStyle || ((!parentStyle->pred) || (parentStyle->path != childStyle->path)))
    215215
    216 static void writeStyle(QTextStream &ts, const RenderObject &object)
     216static void writeStyle(TextStream &ts, const RenderObject &object)
    217217{
    218218    const RenderStyle *style = object.style();
    … …  
    229229        KRenderingPaintServer *strokePaintServer = KSVGPainterFactory::strokePaintServer(style, &path);
    230230        if (strokePaintServer) {
    231             QTextStreamSeparator s(" ");
     231            TextStreamSeparator s(" ");
    232232            ts << " [stroke={";
    233233            if (strokePaintServer) {
    … …  
    256256        KRenderingPaintServer *fillPaintServer = KSVGPainterFactory::fillPaintServer(style, &path);
    257257        if (fillPaintServer) {
    258             QTextStreamSeparator s(" ");
     258            TextStreamSeparator s(" ");
    259259            ts << " [fill={";
    260260            if (fillPaintServer) {
    … …  
    286286#undef DIFFERS_FROM_PARENT_AVOID_TEST_IF_FALSE
    287287
    288 static QTextStream &operator<<(QTextStream &ts, const RenderPath &o)
     288static TextStream &operator<<(TextStream &ts, const RenderPath &o)
    289289{
    290290    ts << " " << o.absoluteTransform().mapRect(o.relativeBBox());
    … …  
    297297}
    298298
    299 static QTextStream &operator<<(QTextStream &ts, const KCanvasContainer &o)
     299static TextStream &operator<<(TextStream &ts, const RenderSVGContainer &o)
    300300{
    301301    ts << " " << o.absoluteTransform().mapRect(o.relativeBBox());
    … …  
    314314}
    315315
    316 void write(QTextStream &ts, const KCanvasContainer &container, int indent)
     316void write(TextStream &ts, const RenderSVGContainer &container, int indent)
    317317{
    318318    writeIndent(ts, indent);
    … …  
    331331}
    332332
    333 void write(QTextStream &ts, const RenderPath &path, int indent)
     333void write(TextStream &ts, const RenderPath &path, int indent)
    334334{
    335335    writeIndent(ts, indent);
    … …  
    345345}
    346346
    347 void writeRenderResources(QTextStream &ts, Node *parent)
     347void writeRenderResources(TextStream &ts, Node *parent)
    348348{
    349349    ASSERT(parent);
    … …  
    369369}
    370370
    371 QTextStream &operator<<(QTextStream &ts, const DeprecatedStringList &l)
     371TextStream &operator<<(TextStream &ts, const DeprecatedStringList &l)
    372372{
    373373    ts << "[";

  • trunk/WebCore/kcanvas/KCanvasTreeDebug.h

    r14407 r15253  
    2525
    2626#include "DeprecatedString.h"
    27 #include "KWQTextStream.h"
     27#include "TextStream.h"
    2828#include "DeprecatedValueList.h"
    2929
    30 class QMatrix;
     30class AffineTransform;
    3131class DeprecatedStringList;
    3232
    … …  
    4242    class Node;
    4343    class RenderPath;
    44     class KCanvasContainer;
     44    class RenderSVGContainer;
    4545
    4646// functions used by the main RenderTreeAsText code
    47 void write(QTextStream &ts, const WebCore::KCanvasContainer &container, int indent = 0);
    48 void write(QTextStream &ts, const WebCore::RenderPath &path, int indent = 0);
    49 void writeRenderResources(QTextStream &ts, WebCore::Node *parent);
     47void write(TextStream &ts, const WebCore::RenderSVGContainer &container, int indent = 0);
     48void write(TextStream &ts, const WebCore::RenderPath &path, int indent = 0);
     49void writeRenderResources(TextStream &ts, WebCore::Node *parent);
    5050
    5151// helper operators defined used in various classes to dump the render tree.
    52 QTextStream &operator<<(QTextStream &ts, const QMatrix &);
    53 QTextStream &operator<<(QTextStream &ts, const WebCore::IntRect &);
    54 QTextStream &operator<<(QTextStream &ts, const WebCore::Color &);
    55 QTextStream &operator<<(QTextStream &ts, const WebCore::IntPoint &);
    56 QTextStream &operator<<(QTextStream &ts, const WebCore::FloatSize &);
    57 QTextStream &operator<<(QTextStream &ts, const WebCore::FloatRect &);
    58 QTextStream &operator<<(QTextStream &ts, const WebCore::FloatPoint &);
     52TextStream &operator<<(TextStream &ts, const AffineTransform &);
     53TextStream &operator<<(TextStream &ts, const WebCore::IntRect &);
     54TextStream &operator<<(TextStream &ts, const WebCore::Color &);
     55TextStream &operator<<(TextStream &ts, const WebCore::IntPoint &);
     56TextStream &operator<<(TextStream &ts, const WebCore::FloatSize &);
     57TextStream &operator<<(TextStream &ts, const WebCore::FloatRect &);
     58TextStream &operator<<(TextStream &ts, const WebCore::FloatPoint &);
    5959
    6060// helper operators specific to dumping the render tree. these are used in various classes to dump the render tree
    6161// these could be defined in separate namespace to avoid matching these generic signatures unintentionally.
    6262   
    63 QTextStream &operator<<(QTextStream &ts, const DeprecatedStringList &l);
     63TextStream &operator<<(TextStream &ts, const DeprecatedStringList &l);
    6464   
    6565template<typename Item>
    66 QTextStream &operator<<(QTextStream &ts, const DeprecatedValueList<Item*> &l)
     66TextStream &operator<<(TextStream &ts, const DeprecatedValueList<Item*> &l)
    6767{
    6868    ts << "[";
    … …  
    8181
    8282template<typename Item>
    83 QTextStream &operator<<(QTextStream &ts, const DeprecatedValueList<Item> &l)
     83TextStream &operator<<(TextStream &ts, const DeprecatedValueList<Item> &l)
    8484{
    8585    ts << "[";

  • trunk/WebCore/kcanvas/RenderForeignObject.cpp

    r14918 r15253  
    3838}
    3939
    40 QMatrix RenderForeignObject::translationForAttributes()
     40AffineTransform RenderForeignObject::translationForAttributes()
    4141{
    4242    SVGForeignObjectElement *foreign = static_cast<SVGForeignObjectElement *>(element());
    43     return QMatrix().translate(foreign->x()->baseVal()->value(), foreign->y()->baseVal()->value());
     43    return AffineTransform().translate(foreign->x()->baseVal()->value(), foreign->y()->baseVal()->value());
    4444}
    4545
    … …  
    6161    paintInfo.p->save();
    6262
    63     context->concatCTM(QMatrix().translate(parentX, parentY));
     63    context->concatCTM(AffineTransform().translate(parentX, parentY));
    6464    context->concatCTM(localTransform());
    6565    context->concatCTM(translationForAttributes());
    … …  
    8888void RenderForeignObject::computeAbsoluteRepaintRect(IntRect& r, bool f)
    8989{
    90     QMatrix transform = translationForAttributes() * localTransform();
     90    AffineTransform transform = translationForAttributes() * localTransform();
    9191    r = transform.mapRect(r);
    9292   
    … …  
    101101void RenderForeignObject::layout()
    102102{
    103     KHTMLAssert(needsLayout());
    104     KHTMLAssert(minMaxKnown());
     103    ASSERT(needsLayout());
     104    ASSERT(minMaxKnown());
    105105
    106106    IntRect oldBounds;
    … …  
    121121bool RenderForeignObject::nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction)
    122122{
    123     QMatrix totalTransform = absoluteTransform();
     123    AffineTransform totalTransform = absoluteTransform();
    124124    totalTransform *= translationForAttributes();
    125125    double localX, localY;

  • trunk/WebCore/kcanvas/RenderForeignObject.h

    r14918 r15253  
    2626
    2727#include "RenderBlock.h"
    28 #include "KWQWMatrix.h"
     28#include "AffineTransform.h"
    2929
    3030namespace WebCore {
    … …  
    4040    virtual void paint(PaintInfo& paintInfo, int parentX, int parentY);
    4141   
    42     virtual QMatrix localTransform() const { return m_transform; }
    43     virtual void setLocalTransform(const QMatrix& transform) { m_transform = transform; }
     42    virtual AffineTransform localTransform() const { return m_transform; }
     43    virtual void setLocalTransform(const AffineTransform& transform) { m_transform = transform; }
    4444   
    4545    virtual void computeAbsoluteRepaintRect(IntRect& r, bool f);
    … …  
    5050
    5151 private:
    52     QMatrix translationForAttributes();
    53     QMatrix m_transform;
     52    AffineTransform translationForAttributes();
     53    AffineTransform m_transform;
    5454    IntRect m_absoluteBounds;
    5555};

  • trunk/WebCore/kcanvas/RenderPath.cpp

    r14918 r15253  
    2727
    2828#include "GraphicsContext.h"
    29 #include "KCanvasContainer.h"
     29#include "RenderSVGContainer.h"
    3030#include "KRenderingDevice.h"
    3131#include "KRenderingFillPainter.h"
    … …  
    4242    FloatRect fillBBox;
    4343    FloatRect strokeBbox;
    44     QMatrix matrix;
     44    AffineTransform matrix;
    4545    IntRect absoluteBounds;
    4646};       
    … …  
    5858}
    5959
    60 QMatrix RenderPath::localTransform() const
     60AffineTransform RenderPath::localTransform() const
    6161{
    6262    return d->matrix;
    6363}
    6464
    65 void RenderPath::setLocalTransform(const QMatrix &matrix)
     65void RenderPath::setLocalTransform(const AffineTransform &matrix)
    6666{
    6767    d->matrix = matrix;

  • trunk/WebCore/kcanvas/RenderPath.h

    r14407 r15253  
    3838
    3939class KCanvasPath;
    40 class KCanvasContainer;
     40class RenderSVGContainer;
    4141class KCanvasMatrix;
    4242
    … …  
    6060    virtual const char *renderName() const { return "KCanvasItem"; }
    6161   
    62     virtual QMatrix localTransform() const;
    63     virtual void setLocalTransform(const QMatrix &matrix);
     62    virtual AffineTransform localTransform() const;
     63    virtual void setLocalTransform(const AffineTransform &matrix);
    6464   
    6565    virtual void layout();

  • trunk/WebCore/kcanvas/RenderSVGContainer.cpp

    r15251 r15253  
    2525#include "KCanvasRenderingStyle.h"
    2626#include "KRenderingDevice.h"
    27 #include "KCanvasContainer.h"
     27#include "RenderSVGContainer.h"
    2828#include "SVGStyledElement.h"
    2929#include "GraphicsContext.h"
    … …  
    3232namespace WebCore {
    3333
    34 class KCanvasContainer::Private
     34class RenderSVGContainer::Private
    3535{
    3636public:
    … …  
    4040    bool drawsContents : 1;
    4141    bool slice : 1;
    42     QMatrix matrix;
     42    AffineTransform matrix;
    4343   
    4444    FloatRect viewport;
    … …  
    4848};
    4949
    50 KCanvasContainer::KCanvasContainer(SVGStyledElement *node)
     50RenderSVGContainer::RenderSVGContainer(SVGStyledElement *node)
    5151: RenderContainer(node), d(new Private())
    5252{
    … …  
    5454}
    5555
    56 KCanvasContainer::~KCanvasContainer()
     56RenderSVGContainer::~RenderSVGContainer()
    5757{
    5858    delete d;
    5959}
    6060
    61 bool KCanvasContainer::drawsContents() const
     61bool RenderSVGContainer::drawsContents() const
    6262{
    6363    return d->drawsContents;
    6464}
    6565
    66 void KCanvasContainer::setDrawsContents(bool drawsContents)
     66void RenderSVGContainer::setDrawsContents(bool drawsContents)
    6767{
    6868    d->drawsContents = drawsContents;
    6969}
    7070
    71 QMatrix KCanvasContainer::localTransform() const
     71AffineTransform RenderSVGContainer::localTransform() const
    7272{
    7373    return d->matrix;
    7474}
    7575
    76 void KCanvasContainer::setLocalTransform(const QMatrix &matrix)
     76void RenderSVGContainer::setLocalTransform(const AffineTransform &matrix)
    7777{
    7878    d->matrix = matrix;
    7979}
    8080
    81 bool KCanvasContainer::canHaveChildren() const
     81bool RenderSVGContainer::canHaveChildren() const
    8282{
    8383    return true;
    8484}
    8585   
    86 bool KCanvasContainer::requiresLayer()
     86bool RenderSVGContainer::requiresLayer()
    8787{
    8888    return false;
    8989}
    9090
    91 short KCanvasContainer::lineHeight(bool b, bool isRootLineBox) const
     91short RenderSVGContainer::lineHeight(bool b, bool isRootLineBox) const
    9292{
    9393    return height() + marginTop() + marginBottom();
    9494}
    9595
    96 short KCanvasContainer::baselinePosition(bool b, bool isRootLineBox) const
     96short RenderSVGContainer::baselinePosition(bool b, bool isRootLineBox) const
    9797{
    9898    return height() + marginTop() + marginBottom();
    9999}
    100100
    101 void KCanvasContainer::calcMinMaxWidth()
    102 {
    103     KHTMLAssert(!minMaxKnown());
     101void RenderSVGContainer::calcMinMaxWidth()
     102{
     103    ASSERT(!minMaxKnown());
    104104    m_minWidth = m_maxWidth = 0;
    105105    setMinMaxKnown();
    106106}
    107107
    108 void KCanvasContainer::layout()
    109 {
    110     KHTMLAssert(needsLayout());
    111     KHTMLAssert(minMaxKnown());
     108void RenderSVGContainer::layout()
     109{
     110    ASSERT(needsLayout());
     111    ASSERT(minMaxKnown());
    112112
    113113    IntRect oldBounds;
    … …  
    127127}
    128128
    129 void KCanvasContainer::paint(PaintInfo &paintInfo, int parentX, int parentY)
     129void RenderSVGContainer::paint(PaintInfo &paintInfo, int parentX, int parentY)
    130130{
    131131    if (paintInfo.p->paintingDisabled())
    … …  
    162162    if (parentX != 0 || parentY != 0) {
    163163        // Translate from parent offsets (khtml) to a relative transform (ksvg2/kcanvas)
    164         deviceContext->concatCTM(QMatrix().translate(parentX, parentY));
     164        deviceContext->concatCTM(AffineTransform().translate(parentX, parentY));
    165165        parentX = parentY = 0;
    166166    }
    167167   
    168168    if (!viewport().isEmpty())
    169         deviceContext->concatCTM(QMatrix().translate(viewport().x(), viewport().y()));
     169        deviceContext->concatCTM(AffineTransform().translate(viewport().x(), viewport().y()));
    170170   
    171171    if (!localTransform().isIdentity())
    … …  
    204204}
    205205
    206 void KCanvasContainer::setViewport(const FloatRect& viewport)
     206void RenderSVGContainer::setViewport(const FloatRect& viewport)
    207207{
    208208    d->viewport = viewport;
    209209}
    210210
    211 FloatRect KCanvasContainer::viewport() const
     211FloatRect RenderSVGContainer::viewport() const
    212212{
    213213   return d->viewport;
    214214}
    215215
    216 void KCanvasContainer::setViewBox(const FloatRect& viewBox)
     216void RenderSVGContainer::setViewBox(const FloatRect& viewBox)
    217217{
    218218    d->viewBox = viewBox;
    219219}
    220220
    221 FloatRect KCanvasContainer::viewBox() const
     221FloatRect RenderSVGContainer::viewBox() const
    222222{
    223223    return d->viewBox;
    224224}
    225225
    226 void KCanvasContainer::setAlign(KCAlign align)
     226void RenderSVGContainer::setAlign(KCAlign align)
    227227{
    228228    d->align = align;
    229229}
    230230
    231 KCAlign KCanvasContainer::align() const
     231KCAlign RenderSVGContainer::align() const
    232232{
    233233    return d->align;
    234234}
    235235
    236 QMatrix KCanvasContainer::viewportTransform() const
     236AffineTransform RenderSVGContainer::viewportTransform() const
    237237{
    238238    if (!viewBox().isEmpty()) {
    … …  
    240240        if (!parent()->isKCanvasContainer())
    241241            viewportRect = FloatRect(viewport().x(), viewport().y(), width(), height());
    242         return getAspectRatio(viewBox(), viewportRect).qmatrix();
    243     }
    244     return QMatrix();
    245 }
    246 
    247 IntRect KCanvasContainer::getAbsoluteRepaintRect()
     242        return getAspectRatio(viewBox(), viewportRect).matrix();
     243    }
     244    return AffineTransform();
     245}
     246
     247IntRect RenderSVGContainer::getAbsoluteRepaintRect()
    248248{
    249249    IntRect repaintRect;
    … …  
    262262}
    263263
    264 void KCanvasContainer::computeAbsoluteRepaintRect(IntRect& r, bool f)
    265 {
    266     QMatrix transform = localTransform();
     264void RenderSVGContainer::computeAbsoluteRepaintRect(IntRect& r, bool f)
     265{
     266    AffineTransform transform = localTransform();
    267267    r = transform.mapRect(r);
    268268   
    … …  
    272272}
    273273
    274 QMatrix KCanvasContainer::absoluteTransform() const
     274AffineTransform RenderSVGContainer::absoluteTransform() const
    275275{
    276276    return viewportTransform() * RenderContainer::absoluteTransform();
    277277}
    278278
    279 bool KCanvasContainer::fillContains(const FloatPoint &p) const
     279bool RenderSVGContainer::fillContains(const FloatPoint &p) const
    280280{
    281281    RenderObject *current = firstChild();
    … …  
    289289}
    290290
    291 bool KCanvasContainer::strokeContains(const FloatPoint &p) const
     291bool RenderSVGContainer::strokeContains(const FloatPoint &p) const
    292292{
    293293    RenderObject *current = firstChild();
    … …  
    301301}
    302302
    303 FloatRect KCanvasContainer::relativeBBox(bool includeStroke) const
     303FloatRect RenderSVGContainer::relativeBBox(bool includeStroke) const
    304304{
    305305    FloatRect rect;
    … …  
    315315}
    316316
    317 void KCanvasContainer::setSlice(bool slice)
     317void RenderSVGContainer::setSlice(bool slice)
    318318{
    319319    d->slice = slice;
    320320}
    321321
    322 bool KCanvasContainer::slice() const
     322bool RenderSVGContainer::slice() const
    323323{
    324324    return d->slice;
    325325}
    326326
    327 KCanvasMatrix KCanvasContainer::getAspectRatio(const FloatRect& logical, const FloatRect& physical) const
     327KCanvasMatrix RenderSVGContainer::getAspectRatio(const FloatRect& logical, const FloatRect& physical) const
    328328{
    329329    KCanvasMatrix temp;

  • trunk/WebCore/kcanvas/RenderSVGContainer.h

    r15251 r15253  
    4545class KCanvasRenderingStyle;
    4646
    47 class KCanvasContainer : public RenderContainer
     47class RenderSVGContainer : public RenderContainer
    4848{
    4949public:
    50     KCanvasContainer(SVGStyledElement*);
    51     ~KCanvasContainer();
     50    RenderSVGContainer(SVGStyledElement*);
     51    ~RenderSVGContainer();
    5252
    5353    // Some containers do not want it's children
    … …  
    7474    virtual void computeAbsoluteRepaintRect(IntRect& r, bool f);
    7575
    76     virtual QMatrix absoluteTransform() const;
     76    virtual AffineTransform absoluteTransform() const;
    7777
    7878    bool fillContains(const FloatPoint&) const;
    … …  
    8080    FloatRect relativeBBox(bool includeStroke = true) const;
    8181   
    82     virtual QMatrix localTransform() const;
    83     void setLocalTransform(const QMatrix&);
     82    virtual AffineTransform localTransform() const;
     83    void setLocalTransform(const AffineTransform&);
    8484   
    8585    void setViewport(const FloatRect&);
    … …  
    9797private:
    9898    KCanvasMatrix getAspectRatio(const FloatRect& logical, const FloatRect& physical) const;
    99     QMatrix viewportTransform() const;
     99    AffineTransform viewportTransform() const;
    100100
    101101    class Private;

  • trunk/WebCore/kcanvas/RenderSVGImage.cpp

    r14918 r15253  
    141141    }
    142142
    143     context->concatCTM(QMatrix().translate(parentX, parentY));
     143    context->concatCTM(AffineTransform().translate(parentX, parentY));
    144144    context->concatCTM(localTransform());
    145145    translateForAttributes();
    … …  
    200200void RenderSVGImage::computeAbsoluteRepaintRect(IntRect& r, bool f)
    201201{
    202     QMatrix transform = translationForAttributes() * localTransform();
     202    AffineTransform transform = translationForAttributes() * localTransform();
    203203    r = transform.mapRect(r);
    204204   
    … …  
    208208bool RenderSVGImage::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
    209209{
    210     QMatrix totalTransform = absoluteTransform();
     210    AffineTransform totalTransform = absoluteTransform();
    211211    totalTransform *= translationForAttributes();
    212212    double localX, localY;
    … …  
    222222void RenderSVGImage::layout()
    223223{
    224     KHTMLAssert(needsLayout());
    225     KHTMLAssert(minMaxKnown());
     224    ASSERT(needsLayout());
     225    ASSERT(minMaxKnown());
    226226
    227227    IntRect oldBounds;
    … …  
    280280
    281281
    282 QMatrix RenderSVGImage::translationForAttributes()
     282AffineTransform RenderSVGImage::translationForAttributes()
    283283{
    284284    SVGImageElement *image = static_cast<SVGImageElement *>(node());
    285285    float xOffset = image->x()->baseVal() ? image->x()->baseVal()->value() : 0;
    286286    float yOffset = image->y()->baseVal() ? image->y()->baseVal()->value() : 0;
    287     return QMatrix().translate(xOffset, yOffset);
     287    return AffineTransform().translate(xOffset, yOffset);
    288288}
    289289

  • trunk/WebCore/kcanvas/RenderSVGImage.h

    r14918 r15253  
    2626
    2727#include "RenderImage.h"
    28 #include "KWQWMatrix.h"
     28#include "AffineTransform.h"
    2929
    3030namespace WebCore
    … …  
    3737        virtual ~RenderSVGImage();
    3838       
    39         virtual QMatrix localTransform() const { return m_transform; }
    40         virtual void setLocalTransform(const QMatrix& transform) { m_transform = transform; }
     39        virtual AffineTransform localTransform() const { return m_transform; }
     40        virtual void setLocalTransform(const AffineTransform& transform) { m_transform = transform; }
    4141       
    4242        virtual FloatRect relativeBBox(bool includeStroke = true) const;
    … …  
    5858    private:
    5959        void translateForAttributes();
    60         QMatrix translationForAttributes();
    61         QMatrix m_transform;
     60        AffineTransform translationForAttributes();
     61        AffineTransform m_transform;
    6262        IntRect m_absoluteBounds;
    6363    };

  • trunk/WebCore/kcanvas/RenderSVGText.cpp

    r14921 r15253  
    4141}
    4242
    43 QMatrix RenderSVGText::translationTopToBaseline()
     43AffineTransform RenderSVGText::translationTopToBaseline()
    4444{
    4545    int offset = baselinePosition(true, true);
    46     return QMatrix().translate(0, -offset);
     46    return AffineTransform().translate(0, -offset);
    4747}
    4848
    49 QMatrix RenderSVGText::translationForAttributes()
     49AffineTransform RenderSVGText::translationForAttributes()
    5050{
    5151    SVGTextElement *text = static_cast<SVGTextElement *>(element());
    … …  
    5454    float yOffset = text->y()->baseVal()->getFirst() ? text->y()->baseVal()->getFirst()->value() : 0;
    5555
    56     return QMatrix().translate(xOffset, yOffset);
     56    return AffineTransform().translate(xOffset, yOffset);
    5757}
    5858
    … …  
    7575   
    7676    context->concatCTM(localTransform());
    77     context->concatCTM(QMatrix().translate(parentX, parentY));
     77    context->concatCTM(AffineTransform().translate(parentX, parentY));
    7878    context->concatCTM(translationForAttributes());
    7979    context->concatCTM(translationTopToBaseline());
    … …  
    140140void RenderSVGText::computeAbsoluteRepaintRect(IntRect& r, bool f)
    141141{
    142     QMatrix transform = translationTopToBaseline() * translationForAttributes() * absoluteTransform();
     142    AffineTransform transform = translationTopToBaseline() * translationForAttributes() * absoluteTransform();
    143143    r = transform.mapRect(r);
    144144   
    … …  
    153153void RenderSVGText::layout()
    154154{
    155     KHTMLAssert(needsLayout());
    156     KHTMLAssert(minMaxKnown());
     155    ASSERT(needsLayout());
     156    ASSERT(minMaxKnown());
    157157
    158158    IntRect oldBounds;
    … …  
    174174bool RenderSVGText::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
    175175{
    176     QMatrix totalTransform = translationForAttributes();
     176    AffineTransform totalTransform = translationForAttributes();
    177177    totalTransform *= translationTopToBaseline();
    178178    totalTransform *= absoluteTransform();
    … …  
    184184void RenderSVGText::absoluteRects(DeprecatedValueList<IntRect>& rects, int _tx, int _ty)
    185185{
    186     QMatrix mat = translationForAttributes();
     186    AffineTransform mat = translationForAttributes();
    187187    mat *= translationTopToBaseline();
    188188    mat *= absoluteTransform();

  • trunk/WebCore/kcanvas/RenderSVGText.h

    r14918 r15253  
    2626
    2727#include "RenderBlock.h"
    28 #include "KWQWMatrix.h"
     28#include "AffineTransform.h"
    2929
    3030namespace WebCore {
    … …  
    4040    virtual void paint(PaintInfo&, int parentX, int parentY);
    4141   
    42     virtual QMatrix localTransform() const { return m_transform; }
    43     virtual void setLocalTransform(const QMatrix& transform) { m_transform = transform; }
     42    virtual AffineTransform localTransform() const { return m_transform; }
     43    virtual void setLocalTransform(const AffineTransform& transform) { m_transform = transform; }
    4444   
    4545    virtual bool nodeAtPoint(NodeInfo&, int _x, int _y, int _tx, int _ty, WebCore::HitTestAction);
    … …  
    5252   
    5353 private:
    54     QMatrix translationTopToBaseline();
    55     QMatrix translationForAttributes();
    56     QMatrix m_transform;
     54    AffineTransform translationTopToBaseline();
     55    AffineTransform translationForAttributes();
     56    AffineTransform m_transform;
    5757    IntRect m_absoluteBounds;
    5858};

  • trunk/WebCore/kcanvas/device/KRenderingPaintServer.h

    r13393 r15253  
    2828#include <kcanvas/KCanvasResources.h>
    2929
    30 class QTextStream;
     30class TextStream;
    3131
    3232namespace WebCore {
    … …  
    7575    void setPaintingText(bool paintingText) { m_paintingText = paintingText; }
    7676
    77     virtual QTextStream &externalRepresentation(QTextStream &) const = 0;
     77    virtual TextStream &externalRepresentation(TextStream &) const = 0;
    7878
    7979    virtual void renderPath(KRenderingDeviceContext*, const RenderPath*, KCPaintTargetType) const = 0;
    … …  
    8686}
    8787
    88 QTextStream &operator<<(QTextStream &, const WebCore::KRenderingPaintServer &);
     88TextStream &operator<<(TextStream &, const WebCore::KRenderingPaintServer &);
    8989
    9090#endif // SVG_SUPPORT

  • trunk/WebCore/kcanvas/device/KRenderingPaintServerGradient.cpp

    r13858 r15253  
    2828#include "KCanvasMatrix.h"
    2929
    30 #include "KWQTextStream.h"
     30#include "TextStream.h"
    3131#include "KCanvasTreeDebug.h"
    3232
    … …  
    3434
    3535//KCGradientSpreadMethod
    36 QTextStream &operator<<(QTextStream &ts, KCGradientSpreadMethod m)
     36TextStream &operator<<(TextStream &ts, KCGradientSpreadMethod m)
    3737{
    3838    switch (m)
    … …  
    4848}
    4949
    50 QTextStream &operator<<(QTextStream &ts, const Vector<KCGradientStop>& l)
     50TextStream &operator<<(TextStream &ts, const Vector<KCGradientStop>& l)
    5151{
    5252    ts << "[";
    … …  
    134134}
    135135
    136 QTextStream &KRenderingPaintServerGradient::externalRepresentation(QTextStream &ts) const
     136TextStream &KRenderingPaintServerGradient::externalRepresentation(TextStream &ts) const
    137137{
    138138    // abstract, don't stream type
    … …  
    142142    if (!boundingBoxMode())
    143143        ts << " [bounding box mode=" << boundingBoxMode() << "]";
    144     if (!gradientTransform().qmatrix().isIdentity())
    145         ts << " [transform=" << gradientTransform().qmatrix() << "]";
     144    if (!gradientTransform().matrix().isIdentity())
     145        ts << " [transform=" << gradientTransform().matrix() << "]";
    146146   
    147147    return ts;
    … …  
    192192}
    193193
    194 QTextStream &KRenderingPaintServerLinearGradient::externalRepresentation(QTextStream &ts) const
     194TextStream &KRenderingPaintServerLinearGradient::externalRepresentation(TextStream &ts) const
    195195{
    196196    ts << "[type=LINEAR-GRADIENT] ";   
    … …  
    266266}
    267267
    268 QTextStream &KRenderingPaintServerRadialGradient::externalRepresentation(QTextStream &ts) const
     268TextStream &KRenderingPaintServerRadialGradient::externalRepresentation(TextStream &ts) const
    269269{
    270270    ts << "[type=RADIAL-GRADIENT] ";

  • trunk/WebCore/kcanvas/device/KRenderingPaintServerGradient.h

    r13821 r15253  
    3838inline KCGradientStop makeGradientStop(float offset, const Color& color) { return std::make_pair(offset, color); }
    3939
    40 QTextStream &operator<<(QTextStream &ts, WebCore::KCGradientSpreadMethod m);
     40TextStream &operator<<(TextStream &ts, WebCore::KCGradientSpreadMethod m);
    4141
    4242class KCanvasMatrix;
    … …  
    6868    void setListener(KCanvasResourceListener *listener);
    6969
    70     QTextStream &externalRepresentation(QTextStream &) const;
     70    TextStream &externalRepresentation(TextStream &) const;
    7171private:
    7272    class Private;
    … …  
    8989    void setGradientEnd(const FloatPoint &end);
    9090
    91     QTextStream &externalRepresentation(QTextStream &) const;
     91    TextStream &externalRepresentation(TextStream &) const;
    9292private:
    9393    class Private;
    … …  
    113113    void setGradientRadius(float radius);
    114114
    115     QTextStream &externalRepresentation(QTextStream &) const;
     115    TextStream &externalRepresentation(TextStream &) const;
    116116private:
    117117    class Private;

  • trunk/WebCore/kcanvas/device/KRenderingPaintServerPattern.cpp

    r13858 r15253  
    2727#include "KRenderingPaintServerPattern.h"
    2828
    29 #include "KWQTextStream.h"
     29#include "TextStream.h"
    3030#include "KCanvasTreeDebug.h"
    3131
    … …  
    114114}
    115115
    116 QTextStream &KRenderingPaintServerPattern::externalRepresentation(QTextStream &ts) const
     116TextStream &KRenderingPaintServerPattern::externalRepresentation(TextStream &ts) const
    117117{
    118118     ts << "[type=PATTERN]"
    … …  
    120120    if (!boundingBoxMode())
    121121        ts << " [bounding box mode=" << boundingBoxMode() << "]";       
    122     if (!patternTransform().qmatrix().isIdentity())
    123         ts << " [pattern transform=" << patternTransform().qmatrix() << "]";
     122    if (!patternTransform().matrix().isIdentity())
     123        ts << " [pattern transform=" << patternTransform().matrix() << "]";
    124124    return ts;
    125125}

  • trunk/WebCore/kcanvas/device/KRenderingPaintServerPattern.h

    r13821 r15253  
    5757    KCanvasResourceListener *listener() const;
    5858    void setListener(KCanvasResourceListener *listener);
    59     QTextStream &externalRepresentation(QTextStream &) const;
     59    TextStream &externalRepresentation(TextStream &) const;
    6060
    6161private:

  • trunk/WebCore/kcanvas/device/KRenderingPaintServerSolid.cpp

    r13858 r15253  
    2424#if SVG_SUPPORT
    2525#include "KRenderingPaintServerSolid.h"
    26 #include "KWQTextStream.h"
     26#include "TextStream.h"
    2727#include "KCanvasTreeDebug.h"
    2828
    2929// this is related to KRenderingPaintServer, but currently it doesn't have its own .cpp file
    30 QTextStream &operator<<(QTextStream &ts, const WebCore::KRenderingPaintServer &ps)
     30TextStream &operator<<(TextStream &ts, const WebCore::KRenderingPaintServer &ps)
    3131{
    3232    return ps.externalRepresentation(ts);
    … …  
    6868}
    6969
    70 QTextStream &KRenderingPaintServerSolid::externalRepresentation(QTextStream &ts) const
     70TextStream &KRenderingPaintServerSolid::externalRepresentation(TextStream &ts) const
    7171{
    7272    ts << "[type=SOLID]"

  • trunk/WebCore/kcanvas/device/KRenderingPaintServerSolid.h

    r13821 r15253  
    4141    void setColor(const Color &color);
    4242
    43     QTextStream &externalRepresentation(QTextStream &) const;
     43    TextStream &externalRepresentation(TextStream &) const;
    4444private:
    4545    class Private;

  • trunk/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm

    r14096 r15253  
    9292KCanvasFilterQuartz::KCanvasFilterQuartz() : m_filterCIContext(0), m_filterCGLayer(0)
    9393{
    94     m_imagesByName = KWQRetainNSRelease([[NSMutableDictionary alloc] init]);
     94    m_imagesByName = HardRetainWithNSRelease([[NSMutableDictionary alloc] init]);
    9595}
    9696
    … …  
    9999    ASSERT(!m_filterCGLayer);
    100100    ASSERT(!m_filterCIContext);
    101     KWQRelease(m_imagesByName);
     101    HardRelease(m_imagesByName);
    102102}
    103103
    … …  
    116116        contextOptions = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], kCIContextUseSoftwareRenderer, nil];
    117117   
    118     m_filterCIContext = KWQRetain([CIContext contextWithCGContext:cgContext options:contextOptions]);
     118    m_filterCIContext = HardRetain([CIContext contextWithCGContext:cgContext options:contextOptions]);
    119119    m_filterCGLayer = [m_filterCIContext createCGLayerWithSize:CGRect(bbox).size info:NULL];
    120120   
    … …  
    122122    renderingDevice()->pushContext(filterContext);
    123123   
    124     filterContext->concatCTM(QMatrix().translate(-1.0f * bbox.x(), -1.0f * bbox.y()));
     124    filterContext->concatCTM(AffineTransform().translate(-1.0f * bbox.x(), -1.0f * bbox.y()));
    125125}
    126126
    … …  
    155155    m_filterCGLayer = 0;
    156156
    157     KWQRelease(m_filterCIContext);
     157    HardRelease(m_filterCIContext);
    158158    m_filterCIContext = 0;
    159159}

  • trunk/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.h

    r13992 r15253  
    2929#import "kcanvas/RenderPath.h"
    3030
    31 #include "KWQWMatrix.h"
     31#include "AffineTransform.h"
    3232
    3333namespace WebCore {

  • trunk/WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.h

    r14097 r15253  
    2828
    2929#import "KCanvasImage.h"
    30 #import "KCanvasContainer.h"
    31 #import "KWQWMatrix.h"
     30#import "RenderSVGContainer.h"
     31#import "AffineTransform.h"
    3232
    3333typedef struct CGContext *CGContextRef;

  • trunk/WebCore/kcanvas/device/quartz/KRenderingDeviceQuartz.mm

    r14638 r15253  
    5454{
    5555    CGContextRelease(m_cgContext);
    56     KWQRelease(m_nsGraphicsContext);
     56    HardRelease(m_nsGraphicsContext);
    5757}
    5858
    … …  
    9595{
    9696    if (!m_nsGraphicsContext && m_cgContext)
    97         m_nsGraphicsContext = KWQRetain([NSGraphicsContext graphicsContextWithGraphicsPort:m_cgContext flipped:YES]);
     97        m_nsGraphicsContext = HardRetain([NSGraphicsContext graphicsContextWithGraphicsPort:m_cgContext flipped:YES]);
    9898    return m_nsGraphicsContext;
    9999}

  • trunk/WebCore/kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm

    r15021 r15253  
    290290   
    291291    // apply the gradient's own transform
    292     CGAffineTransform gradientTransform = CGAffineTransform(server->gradientTransform().qmatrix());
     292    CGAffineTransform gradientTransform = CGAffineTransform(server->gradientTransform().matrix());
    293293    CGContextConcatCTM(context, gradientTransform);
    294294}

  • trunk/WebCore/kcanvas/device/quartz/KRenderingPaintServerQuartz.mm

    r13901 r15253  
    167167    // Patterns don't seem to resepect the CTM unless we make them...
    168168    CGAffineTransform ctm = CGContextGetCTM(context);
    169     CGAffineTransform transform = CGAffineTransform(patternTransform().qmatrix());
     169    CGAffineTransform transform = CGAffineTransform(patternTransform().matrix());
    170170    transform = CGAffineTransformConcat(transform, ctm);
    171171

  • trunk/WebCore/ksvg2/css/CSSValueKeywords.in

    r13393 r15253  
    55#
    66# The Values are sorted according to the properties they belong to,
    7 # and have to be in the same order as the enums in render_style.h.
     7# and have to be in the same order as the enums in RenderStyle.h.
    88#
    99# If not, the optimizations in the cssparser and style selector will fail,

  • trunk/WebCore/ksvg2/css/SVGRenderStyleDefs.cpp

    r12761 r15253  
    3030#if SVG_SUPPORT
    3131#include "ksvg.h"
    32 #include "render_style.h"
     32#include "RenderStyle.h"
    3333#include "SVGRenderStyle.h"
    3434#include "SVGRenderStyleDefs.h"

  • trunk/WebCore/ksvg2/misc/KCanvasRenderingStyle.cpp

    r14407 r15253  
    4141#include "SVGStyledElement.h"
    4242#include "ksvg.h"
    43 #include "render_style.h"
     43#include "RenderStyle.h"
    4444
    4545namespace WebCore {

  • trunk/WebCore/ksvg2/misc/KSVGTimeScheduler.cpp

    r13634 r15253  
    190190                    if(animation->isAdditive() && initialMatrix)
    191191                    {
    192                         RefPtr<SVGMatrix> matrix = new SVGMatrix(initialMatrix->qmatrix());
     192                        RefPtr<SVGMatrix> matrix = new SVGMatrix(initialMatrix->matrix());
    193193                       
    194194                        data->setMatrix(matrix.get());

  • trunk/WebCore/ksvg2/svg/SVGAElement.cpp

    r14916 r15253  
    3636#include "SVGNames.h"
    3737#include "csshelper.h"
    38 #include <kcanvas/KCanvasContainer.h>
     38#include <kcanvas/RenderSVGContainer.h>
    3939#include <kcanvas/KCanvasCreator.h>
    4040#include <kcanvas/device/KRenderingDevice.h>
    … …  
    7676RenderObject* SVGAElement::createRenderer(RenderArena* arena, RenderStyle* style)
    7777{
    78     return new (arena) KCanvasContainer(this);
     78    return new (arena) RenderSVGContainer(this);
    7979}
    8080

  • trunk/WebCore/ksvg2/svg/SVGAnimateTransformElement.cpp

    r14646 r15253  
    173173        timePercentage = 1.0;
    174174   
    175     QWMatrix qToMatrix, qFromMatrix;
     175    AffineTransform qToMatrix, qFromMatrix;
    176176    double useTimePercentage = timePercentage;
    177177
    … …  
    192192                bool apply = false;
    193193                if (m_toTransform && m_fromTransform) {   
    194                     qToMatrix = m_toTransform->matrix()->qmatrix();
    195                     qFromMatrix = m_fromTransform->matrix()->qmatrix();
     194                    qToMatrix = m_toTransform->matrix()->matrix();
     195                    qFromMatrix = m_fromTransform->matrix()->matrix();
    196196                   
    197197                    apply = true;
    … …  
    216216
    217217    if (m_toTransform && m_toTransform->matrix() && qToMatrix.isIdentity())
    218         qToMatrix = m_toTransform->matrix()->qmatrix();
     218        qToMatrix = m_toTransform->matrix()->matrix();
    219219
    220220    if (m_fromTransform && m_fromTransform->matrix() && qFromMatrix.isIdentity())
    221         qFromMatrix = m_fromTransform->matrix()->qmatrix();
     221        qFromMatrix = m_fromTransform->matrix()->matrix();
    222222
    223223    if (!m_transformMatrix)
    … …  
    420420}
    421421
    422 void SVGAnimateTransformElement::calculateRotationFromMatrix(const QWMatrix &matrix, double &angle, double &cx, double &cy) const
     422void SVGAnimateTransformElement::calculateRotationFromMatrix(const AffineTransform &matrix, double &angle, double &cx, double &cy) const
    423423{
    424424    double cosa = matrix.m11();

  • trunk/WebCore/ksvg2/svg/SVGAnimateTransformElement.h

    r14646 r15253  
    4545        // Helpers
    4646        RefPtr<SVGTransform> parseTransformValue(const DeprecatedString &data) const;
    47         void calculateRotationFromMatrix(const QWMatrix &matrix, double &angle, double &cx, double &cy) const;
     47        void calculateRotationFromMatrix(const AffineTransform &matrix, double &angle, double &cx, double &cy) const;
    4848
    4949        SVGMatrix *initialMatrix() const;

  • trunk/WebCore/ksvg2/svg/SVGGElement.cpp

    r14097 r15253  
    2626
    2727#include <kcanvas/KCanvasCreator.h>
    28 #include <kcanvas/KCanvasContainer.h>
     28#include <kcanvas/RenderSVGContainer.h>
    2929#include <kcanvas/device/KRenderingDevice.h>
    3030
    … …  
    4949RenderObject* SVGGElement::createRenderer(RenderArena* arena, RenderStyle* style)
    5050{
    51     return new (arena) KCanvasContainer(this);
     51    return new (arena) RenderSVGContainer(this);
    5252}
    5353

  • trunk/WebCore/ksvg2/svg/SVGHelper.cpp

    r14646 r15253  
    7979}
    8080
    81 void SVGHelper::ParseSeperatedList(SVGStringList *list, const DeprecatedString &data, const QChar &delimiter)
     81void SVGHelper::ParseSeperatedList(SVGStringList *list, const DeprecatedString &data, const DeprecatedChar &delimiter)
    8282{
    8383    // TODO : more error checking/reporting

  • trunk/WebCore/ksvg2/svg/SVGHelper.h

    r13821 r15253  
    4646        static float PercentageOfViewport(float value, const SVGElement *viewportElement, LengthMode mode);
    4747
    48         static void ParseSeperatedList(SVGStringList *list, const DeprecatedString &data, const QChar &delimiter = ',');
     48        static void ParseSeperatedList(SVGStringList *list, const DeprecatedString &data, const DeprecatedChar &delimiter = ',');
    4949    };
    5050

  • trunk/WebCore/ksvg2/svg/SVGImageElement.cpp

    r14256 r15253  
    3838#include "SVGSVGElement.h"
    3939#include "XLinkNames.h"
    40 #include <kcanvas/KCanvasContainer.h>
     40#include <kcanvas/RenderSVGContainer.h>
    4141#include <kcanvas/KCanvasCreator.h>
    4242#include <kcanvas/KCanvasImage.h>

  • trunk/WebCore/ksvg2/svg/SVGLinearGradientElement.cpp

    r13634 r15253  
    113113    KCanvasMatrix mat;
    114114    if(gradientTransform()->baseVal()->numberOfItems() > 0)
    115         mat = KCanvasMatrix(gradientTransform()->baseVal()->consolidate()->matrix()->qmatrix());
     115        mat = KCanvasMatrix(gradientTransform()->baseVal()->consolidate()->matrix()->matrix());
    116116
    117117    DeprecatedString ref = String(href()->baseVal()).deprecatedString();

  • trunk/WebCore/ksvg2/svg/SVGMarkerElement.cpp

    r14621 r15253  
    3737#include "SVGSVGElement.h"
    3838#include "ksvg.h"
    39 #include <kcanvas/KCanvasContainer.h>
     39#include <kcanvas/RenderSVGContainer.h>
    4040#include <kcanvas/KCanvasCreator.h>
    4141#include <kcanvas/device/KRenderingDevice.h>
    … …  
    168168    double h = markerHeight()->baseVal()->value();
    169169    RefPtr<SVGMatrix> viewBox = viewBoxToViewTransform(w, h);
    170     m_marker->setScale(viewBox->qmatrix().m11(), viewBox->qmatrix().m22());
     170    m_marker->setScale(viewBox->matrix().m11(), viewBox->matrix().m22());
    171171   
    172172    return m_marker;
    … …  
    175175RenderObject* SVGMarkerElement::createRenderer(RenderArena* arena, RenderStyle* style)
    176176{
    177     KCanvasContainer *markerContainer = new (arena) KCanvasContainer(this);
     177    RenderSVGContainer *markerContainer = new (arena) RenderSVGContainer(this);
    178178    markerContainer->setDrawsContents(false); // Marker contents will be explicitly drawn.
    179179    return markerContainer;

  • trunk/WebCore/ksvg2/svg/SVGMaskElement.cpp

    r14256 r15253  
    2727
    2828#include "GraphicsContext.h"
    29 #include "KCanvasContainer.h"
     29#include "RenderSVGContainer.h"
    3030#include "KCanvasImage.h"
    3131#include "KCanvasPath.h"
    … …  
    126126    OwnPtr<GraphicsContext> context(patternContext->createGraphicsContext());
    127127
    128     KCanvasContainer *maskContainer = static_cast<KCanvasContainer *>(renderer());
     128    RenderSVGContainer *maskContainer = static_cast<RenderSVGContainer *>(renderer());
    129129    RenderObject::PaintInfo info(context.get(), IntRect(), PaintPhaseForeground, 0, 0);
    130130    maskContainer->setDrawsContents(true);
    … …  
    140140RenderObject* SVGMaskElement::createRenderer(RenderArena* arena, RenderStyle*)
    141141{
    142     KCanvasContainer* maskContainer = new (arena) KCanvasContainer(this);
     142    RenderSVGContainer* maskContainer = new (arena) RenderSVGContainer(this);
    143143    maskContainer->setDrawsContents(false);
    144144    return maskContainer;

  • trunk/WebCore/ksvg2/svg/SVGMatrix.cpp

    r14646 r15253  
    3636}
    3737
    38 SVGMatrix::SVGMatrix(const QMatrix& mat)
     38SVGMatrix::SVGMatrix(const AffineTransform& mat)
    3939    : Shared<SVGMatrix>()
    4040    , m_mat(mat)
    … …  
    118118SVGMatrix* SVGMatrix::postMultiply(const SVGMatrix* secondMatrix)
    119119{
    120     QMatrix temp(secondMatrix->a(), secondMatrix->b(), secondMatrix->c(), secondMatrix->d(), secondMatrix->e(), secondMatrix->f());
     120    AffineTransform temp(secondMatrix->a(), secondMatrix->b(), secondMatrix->c(), secondMatrix->d(), secondMatrix->e(), secondMatrix->f());
    121121    m_mat *= temp;
    122122    return this;
    … …  
    134134{
    135135    // Could optimise these.
    136     QMatrix temp;
     136    AffineTransform temp;
    137137    temp.translate(x, y);
    138138    m_mat *= temp;
    … …  
    142142SVGMatrix* SVGMatrix::postScale(double scaleFactor)
    143143{
    144     QMatrix temp;
     144    AffineTransform temp;
    145145    temp.scale(scaleFactor, scaleFactor);
    146146    m_mat *= temp;
    … …  
    150150SVGMatrix* SVGMatrix::postScaleNonUniform(double scaleFactorX, double scaleFactorY)
    151151{
    152     QMatrix temp;
     152    AffineTransform temp;
    153153    temp.scale(scaleFactorX, scaleFactorY);
    154154    m_mat *= temp;
    … …  
    158158SVGMatrix* SVGMatrix::postRotate(double angle)
    159159{
    160     QMatrix temp;
     160    AffineTransform temp;
    161161    temp.rotate(angle);
    162162    m_mat *= temp;
    … …  
    166166SVGMatrix* SVGMatrix::postRotateFromVector(double x, double y)
    167167{
    168     QMatrix temp;
     168    AffineTransform temp;
    169169    temp.rotate(SVGAngle::todeg(atan2(y, x)));
    170170    m_mat *= temp;
    … …  
    174174SVGMatrix* SVGMatrix::postFlipX()
    175175{
    176     QMatrix temp(-1.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F);
     176    AffineTransform temp(-1.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F);
    177177    m_mat *= temp;
    178178    return this;
    … …  
    181181SVGMatrix* SVGMatrix::postFlipY()
    182182{
    183     QMatrix temp(1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F);
     183    AffineTransform temp(1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F);
    184184    m_mat *= temp;
    185185    return this;
    … …  
    188188SVGMatrix* SVGMatrix::postSkewX(double angle)
    189189{
    190     QMatrix temp;
     190    AffineTransform temp;
    191191    temp.shear(tan(SVGAngle::torad(angle)), 0.0F);
    192192    m_mat *= temp;
    … …  
    196196SVGMatrix* SVGMatrix::postSkewY(double angle)
    197197{
    198     QMatrix temp;
     198    AffineTransform temp;
    199199    temp.shear(0.0F, tan(SVGAngle::torad(angle)));
    200200    m_mat *= temp;
    … …  
    204204SVGMatrix* SVGMatrix::multiply(const SVGMatrix* secondMatrix)
    205205{
    206     QMatrix temp(secondMatrix->a(), secondMatrix->b(), secondMatrix->c(), secondMatrix->d(), secondMatrix->e(), secondMatrix->f());
     206    AffineTransform temp(secondMatrix->a(), secondMatrix->b(), secondMatrix->c(), secondMatrix->d(), secondMatrix->e(), secondMatrix->f());
    207207    temp *= m_mat;
    208208    m_mat = temp;
    … …  
    268268}
    269269
    270 void SVGMatrix::setMatrix(const QMatrix& mat)
     270void SVGMatrix::setMatrix(const AffineTransform& mat)
    271271{
    272272    m_mat = mat;
    273273}
    274274
    275 QMatrix& SVGMatrix::qmatrix()
     275AffineTransform& SVGMatrix::matrix()
    276276{
    277277    return m_mat;
    278278}
    279279
    280 const QMatrix& SVGMatrix::qmatrix() const
     280const AffineTransform& SVGMatrix::matrix() const
    281281{
    282282    return m_mat;

  • trunk/WebCore/ksvg2/svg/SVGMatrix.h

    r14646 r15253  
    2525#if SVG_SUPPORT
    2626
    27 #include "KWQWMatrix.h"
     27#include "AffineTransform.h"
    2828
    2929#include "Shared.h"
    … …  
    3838        SVGMatrix();
    3939        SVGMatrix(double a, double b, double c, double d, double e, double f);
    40         SVGMatrix(const QMatrix& mat);
     40        SVGMatrix(const AffineTransform& mat);
    4141        virtual ~SVGMatrix();
    4242
    … …  
    9090
    9191        // KSVG helper method
    92         QMatrix& qmatrix();
    93         const QMatrix& qmatrix() const;
     92        AffineTransform& matrix();
     93        const AffineTransform& matrix() const;
    9494
    9595        // Determine the scaling component of the matrix and factor it out. After
    … …  
    9898
    9999    private:
    100         void setMatrix(const QMatrix&);
    101         QMatrix m_mat;
     100        void setMatrix(const AffineTransform&);
     101        AffineTransform m_mat;
    102102    };
    103103};

  • trunk/WebCore/ksvg2/svg/SVGPatternElement.cpp

    r14680 r15253  
    2828#include "Document.h"
    2929#include "GraphicsContext.h"
    30 #include "KCanvasContainer.h"
     30#include "RenderSVGContainer.h"
    3131#include "KCanvasCreator.h"
    3232#include "KCanvasImage.h"
    … …  
    261261            RefPtr<SVGMatrix> ctm = getCTM();
    262262
    263             KCanvasMatrix newMatrix(svgCTM->qmatrix());
     263            KCanvasMatrix newMatrix(svgCTM->matrix());
    264264            newMatrix.multiply(savedMatrix);
    265265            newMatrix.scale(1.0 / ctm->a(), 1.0 / ctm->d());
    266266
    267             item->setLocalTransform(newMatrix.qmatrix());
     267            item->setLocalTransform(newMatrix.matrix());
    268268        }
    269269#endif
    … …  
    276276            e->pushAttributeContext(savedContext);
    277277
    278         item->setLocalTransform(savedMatrix.qmatrix());
     278        item->setLocalTransform(savedMatrix.matrix());
    279279#endif
    280280    }
    … …  
    341341    KCanvasMatrix patternTransformMatrix;
    342342    if (patternTransform()->baseVal()->numberOfItems() > 0)
    343         patternTransformMatrix = KCanvasMatrix(patternTransform()->baseVal()->consolidate()->matrix()->qmatrix());
     343        patternTransformMatrix = KCanvasMatrix(patternTransform()->baseVal()->consolidate()->matrix()->matrix());
    344344
    345345    fillAttributesFromReferencePattern(target, patternTransformMatrix);
    … …  
    357357RenderObject* SVGPatternElement::createRenderer(RenderArena* arena, RenderStyle*)
    358358{
    359     KCanvasContainer* patternContainer = new (arena) KCanvasContainer(this);
     359    RenderSVGContainer* patternContainer = new (arena) RenderSVGContainer(this);
    360360    patternContainer->setDrawsContents(false);
    361361    return patternContainer;

  • trunk/WebCore/ksvg2/svg/SVGRadialGradientElement.cpp

    r13634 r15253  
    133133    KCanvasMatrix mat;
    134134    if(gradientTransform()->baseVal()->numberOfItems() > 0)
    135         mat = KCanvasMatrix(gradientTransform()->baseVal()->consolidate()->matrix()->qmatrix());
     135        mat = KCanvasMatrix(gradientTransform()->baseVal()->consolidate()->matrix()->matrix());
    136136
    137137    DeprecatedString ref = String(href()->baseVal()).deprecatedString();

  • trunk/WebCore/ksvg2/svg/SVGSVGElement.cpp

    r14646 r15253  
    4242#include "SVGZoomEvent.h"
    4343#include "ksvg.h"
    44 #include <kcanvas/KCanvasContainer.h>
     44#include <kcanvas/RenderSVGContainer.h>
    4545#include <kcanvas/KCanvasCreator.h>
    4646#include <kcanvas/device/KRenderingDevice.h>
    47 #include "KWQTextStream.h"
     47#include "TextStream.h"
    4848
    4949namespace WebCore {
    … …  
    132132    double h = height()->baseVal()->value();
    133133    RefPtr<SVGMatrix> viewBox = viewBoxToViewTransform(w, h);
    134     viewBox->qmatrix().map(_x, _y, &_x, &_y);
    135     viewBox->qmatrix().map(w, h, &w, &h);
     134    viewBox->matrix().map(_x, _y, &_x, &_y);
     135    viewBox->matrix().map(w, h, &w, &h);
    136136    return FloatRect(_x, _y, w, h);
    137137}
    … …  
    255255        if (SVGFitToViewBox::parseMappedAttribute(attr)) {
    256256            if (renderer())
    257                 static_cast<KCanvasContainer*>(renderer())->setViewBox(FloatRect(viewBox()->baseVal()->x(), viewBox()->baseVal()->y(), viewBox()->baseVal()->width(), viewBox()->baseVal()->height()));
     257                static_cast<RenderSVGContainer*>(renderer())->setViewBox(FloatRect(viewBox()->baseVal()->x(), viewBox()->baseVal()->y(), viewBox()->baseVal()->width(), viewBox()->baseVal()->height()));
    258258        }
    259259        if(SVGZoomAndPan::parseMappedAttribute(attr)) return;
    … …  
    395395RenderObject* SVGSVGElement::createRenderer(RenderArena* arena, RenderStyle*)
    396396{
    397     KCanvasContainer *rootContainer = new (arena) KCanvasContainer(this);
     397    RenderSVGContainer *rootContainer = new (arena) RenderSVGContainer(this);
    398398
    399399    // FIXME: all this setup should be done after attributesChanged, not here.

  • trunk/WebCore/ksvg2/svg/SVGStyledElement.h

    r14646 r15253  
    2828#include "SVGStylable.h"
    2929
    30 #include "KWQWMatrix.h"
     30#include "AffineTransform.h"
    3131#include <kcanvas/KCanvasPath.h>
    32 #include "render_style.h"
     32#include "RenderStyle.h"
    3333
    3434namespace WebCore

  • trunk/WebCore/ksvg2/svg/SVGStyledTransformableElement.cpp

    r14646 r15253  
    8686        m_localMatrix = localTransform->matrix();
    8787        if (renderer()) {
    88             renderer()->setLocalTransform(m_localMatrix->qmatrix());
     88            renderer()->setLocalTransform(m_localMatrix->matrix());
    8989            renderer()->setNeedsLayout(true);
    9090        }
    … …  
    129129
    130130    if (renderer() && m_localMatrix)
    131         renderer()->setLocalTransform(m_localMatrix->qmatrix());
     131        renderer()->setLocalTransform(m_localMatrix->matrix());
    132132}
    133133

  • trunk/WebCore/ksvg2/svg/SVGStyledTransformableElement.h

    r14646 r15253  
    2828#include "SVGTransformable.h"
    2929
    30 class QMatrix;
     30class AffineTransform;
    3131
    3232namespace WebCore

  • trunk/WebCore/ksvg2/svg/SVGSwitchElement.cpp

    r14097 r15253  
    2626
    2727#include <kcanvas/KCanvasCreator.h>
    28 #include <kcanvas/KCanvasContainer.h>
     28#include <kcanvas/RenderSVGContainer.h>
    2929#include <kcanvas/device/KRenderingDevice.h>
    3030
    … …  
    5959RenderObject* SVGSwitchElement::createRenderer(RenderArena* arena, RenderStyle*)
    6060{
    61     return new (arena) KCanvasContainer(this);
     61    return new (arena) RenderSVGContainer(this);
    6262}
    6363

  • trunk/WebCore/ksvg2/svg/SVGTextElement.cpp

    r14646 r15253  
    3131#include "SVGRenderStyle.h"
    3232#include "SVGTSpanElement.h"
    33 #include "render_style.h"
     33#include "RenderStyle.h"
    3434#include <kcanvas/KCanvasCreator.h>
    3535#include <kcanvas/RenderSVGText.h>
    … …  
    7575        m_localMatrix = localTransform->matrix();
    7676        if (renderer()) {
    77             renderer()->setLocalTransform(m_localMatrix->qmatrix());
     77            renderer()->setLocalTransform(m_localMatrix->matrix());
    7878            renderer()->setNeedsLayout(true);
    7979        }
    … …  
    8686
    8787    if (renderer() && m_localMatrix)
    88         renderer()->setLocalTransform(m_localMatrix->qmatrix());
     88        renderer()->setLocalTransform(m_localMatrix->matrix());
    8989}
    9090

  • trunk/WebCore/ksvg2/svg/SVGTransformable.h

    r13393 r15253  
    2727#include "SVGLocatable.h"
    2828
    29 class QMatrix;
     29class AffineTransform;
    3030
    3131namespace WebCore {

  • trunk/WebCore/ksvg2/svg/SVGUseElement.cpp

    r14097 r15253  
    3838#include "SVGSymbolElement.h"
    3939#include "ksvg.h"
    40 #include <kcanvas/KCanvasContainer.h>
     40#include <kcanvas/RenderSVGContainer.h>
    4141#include <kcanvas/KCanvasCreator.h>
    4242#include <kcanvas/device/KRenderingDevice.h>
    … …  
    166166RenderObject* SVGUseElement::createRenderer(RenderArena* arena, RenderStyle*)
    167167{
    168     return new (arena) KCanvasContainer(this);
     168    return new (arena) RenderSVGContainer(this);
    169169}
    170170

  • trunk/WebCore/kwq/AffineTransform.cpp

    r15251 r15253  
    2525
    2626#include "config.h"
    27 #include "KWQWMatrix.h"
     27#include "AffineTransform.h"
    2828
    2929#include "FloatRect.h"
    … …  
    3232static const double deg2rad = 0.017453292519943295769; // pi/180
    3333
    34 QMatrix::QMatrix()
     34AffineTransform::AffineTransform()
    3535{
    3636    m_transform = CGAffineTransformIdentity;
    3737}
    3838
    39 QMatrix::QMatrix(double a, double b, double c, double d, double tx, double ty)
     39AffineTransform::AffineTransform(double a, double b, double c, double d, double tx, double ty)
    4040{
    4141    m_transform = CGAffineTransformMake(a,b,c,d,tx,ty);
    4242}
    4343
    44 QMatrix::QMatrix(CGAffineTransform t) {
     44AffineTransform::AffineTransform(CGAffineTransform t) {
    4545    m_transform = t;
    4646}
    4747
    48 void QMatrix::setMatrix(double a, double b, double c, double d, double tx, double ty)
     48void AffineTransform::setMatrix(double a, double b, double c, double d, double tx, double ty)
    4949{
    5050    m_transform = CGAffineTransformMake(a,b,c,d,tx,ty);
    5151}
    5252
    53 void QMatrix::map(double x, double y, double *x2, double *y2) const
     53void AffineTransform::map(double x, double y, double *x2, double *y2) const
    5454{
    5555    CGPoint result = CGPointApplyAffineTransform(CGPointMake(x,y),m_transform);
    … …  
    5858}
    5959
    60 IntRect QMatrix::mapRect(const IntRect &rect) const
     60IntRect AffineTransform::mapRect(const IntRect &rect) const
    6161{
    6262    return enclosingIntRect(CGRectApplyAffineTransform(CGRect(rect), m_transform));
    6363}
    6464
    65 FloatRect QMatrix::mapRect(const FloatRect &rect) const
     65FloatRect AffineTransform::mapRect(const FloatRect &rect) const
    6666{
    6767    return FloatRect(CGRectApplyAffineTransform(CGRect(rect), m_transform));
    6868}
    6969
    70 bool QMatrix::isIdentity() const
     70bool AffineTransform::isIdentity() const
    7171{
    7272    return CGAffineTransformIsIdentity(m_transform);
    7373}
    7474
    75 void QMatrix::reset()
     75void AffineTransform::reset()
    7676{
    7777    m_transform = CGAffineTransformIdentity;
    7878}
    7979
    80 QMatrix &QMatrix::scale(double sx, double sy)
     80AffineTransform &AffineTransform::scale(double sx, double sy)
    8181{
    8282    m_transform = CGAffineTransformScale(m_transform, sx, sy);
    … …  
    8484}
    8585
    86 QMatrix &QMatrix::rotate(double d)
     86AffineTransform &AffineTransform::rotate(double d)
    8787{
    8888    m_transform = CGAffineTransformRotate(m_transform, d * deg2rad);
    … …  
    9090}
    9191
    92 QMatrix &QMatrix::translate(double tx, double ty)
     92AffineTransform &AffineTransform::translate(double tx, double ty)
    9393{
    9494    m_transform = CGAffineTransformTranslate(m_transform, tx, ty);
    … …  
    9696}
    9797
    98 QMatrix &QMatrix::shear(double sx, double sy)
     98AffineTransform &AffineTransform::shear(double sx, double sy)
    9999{
    100100    CGAffineTransform shear = CGAffineTransformMake(1, sy, sx, 1, 0, 0);
    … …  
    103103}
    104104
    105 double QMatrix::det() const
     105double AffineTransform::det() const
    106106{
    107107    return m_transform.a * m_transform.d - m_transform.b * m_transform.c;
    108108}
    109109
    110 bool QMatrix::isInvertible() const
     110bool AffineTransform::isInvertible() const
    111111{
    112112    return det() != 0.0;
    113113}
    114114
    115 QMatrix QMatrix::invert() const
     115AffineTransform AffineTransform::invert() const
    116116{
    117117    if (isInvertible())
    118         return QMatrix(CGAffineTransformInvert(m_transform));
    119     return QMatrix();
     118        return AffineTransform(CGAffineTransformInvert(m_transform));
     119    return AffineTransform();
    120120}
    121121
    122 QMatrix::operator CGAffineTransform() const
     122AffineTransform::operator CGAffineTransform() const
    123123{
    124124    return m_transform;
    125125}
    126126
    127 bool QMatrix::operator== (const QMatrix &m2) const
     127bool AffineTransform::operator== (const AffineTransform &m2) const
    128128{
    129129    return CGAffineTransformEqualToTransform(m_transform, CGAffineTransform(m2));
    130130}
    131131
    132 QMatrix &QMatrix::operator*= (const QMatrix &m2)
     132AffineTransform &AffineTransform::operator*= (const AffineTransform &m2)
    133133{
    134134    m_transform = CGAffineTransformConcat(m_transform, CGAffineTransform(m2));
    … …  
    136136}
    137137
    138 QMatrix QMatrix::operator* (const QMatrix &m2)
     138AffineTransform AffineTransform::operator* (const AffineTransform &m2)
    139139{
    140140    return CGAffineTransformConcat(m_transform, CGAffineTransform(m2));

  • trunk/WebCore/kwq/AffineTransform.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef QWMATRIX_H_
    27 #define QWMATRIX_H_
     26#ifndef AffineTransform_h
     27#define AffineTransform_h
    2828
    2929#if __APPLE__
    … …  
    3737}
    3838
    39 class QMatrix {
     39class AffineTransform {
    4040public:
    41     QMatrix();
    42     QMatrix(double a, double b, double c, double d, double tx, double ty);
    43     QMatrix(CGAffineTransform transform);
     41    AffineTransform();
     42    AffineTransform(double a, double b, double c, double d, double tx, double ty);
     43    AffineTransform(CGAffineTransform transform);
    4444
    4545    void setMatrix(double a, double b, double c, double d, double tx, double ty);
    4646    void map(double x, double y, double *x2, double *y2) const;
    47     WebCore::IntRect QMatrix::mapRect(const WebCore::IntRect&) const;
    48     WebCore::FloatRect QMatrix::mapRect(const WebCore::FloatRect&) const;
     47    WebCore::IntRect AffineTransform::mapRect(const WebCore::IntRect&) const;
     48    WebCore::FloatRect AffineTransform::mapRect(const WebCore::FloatRect&) const;
    4949   
    5050    bool isIdentity() const;
    … …  
    5959    void reset();
    6060   
    61     QMatrix &scale(double sx, double sy);
    62     QMatrix &rotate(double d);
    63     QMatrix &translate(double tx, double ty);
    64     QMatrix &shear(double sx, double sy);
     61    AffineTransform &scale(double sx, double sy);
     62    AffineTransform &rotate(double d);
     63    AffineTransform &translate(double tx, double ty);
     64    AffineTransform &shear(double sx, double sy);
    6565   
    6666    double det() const;
    6767    bool isInvertible() const;
    68     QMatrix invert() const;
     68    AffineTransform invert() const;
    6969
    7070    operator CGAffineTransform() const;
    7171
    72     bool operator== (const QMatrix &) const;
    73     QMatrix &operator*= (const QMatrix &);
    74     QMatrix operator* (const QMatrix &m2);
     72    bool operator== (const AffineTransform &) const;
     73    AffineTransform &operator*= (const AffineTransform &);
     74    AffineTransform operator* (const AffineTransform &m2);
    7575   
    7676private:
    … …  
    7878};
    7979
    80 #define QWMatrix QMatrix
     80#define AffineTransform AffineTransform
    8181
    8282#endif // __APPLE__

  • trunk/WebCore/kwq/DeprecatedCString.cpp

    r15251 r15253  
    2525
    2626#include "config.h"
    27 #include "KWQCString.h"
     27#include "DeprecatedCString.h"
    2828
    2929#include <wtf/Assertions.h>

  • trunk/WebCore/kwq/DeprecatedCString.h

    r15251 r15253  
    6868inline bool operator!=(const char *s1, const DeprecatedCString &s2) { return !(s1 == s2); }
    6969
    70 typedef DeprecatedCString Q3CString;
     70typedef DeprecatedCString DeprecatedCString;
    7171
    7272#endif

  • trunk/WebCore/kwq/DeprecatedPtrQueue.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef KWQPTRQUEUE_H_
    27 #define KWQPTRQUEUE_H_
     26#ifndef DeprecatedPtrQueue_h
     27#define DeprecatedPtrQueue_h
    2828
    2929#include "DeprecatedPtrList.h"
    … …  
    4343};
    4444
    45 #endif /* KWQPTRQUEUE_H_ */
     45#endif /* DeprecatedPtrQueue_h */

  • trunk/WebCore/kwq/FileButton.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef KWQFILEBUTTON_H
    27 #define KWQFILEBUTTON_H
     26#ifndef FileButton_h
     27#define FileButton_h
    2828
    2929#include "PlatformString.h"
    … …  
    4040}
    4141
    42 class KWQFileButton : public Widget {
     42class FileButton : public Widget {
    4343public:
    44     KWQFileButton(WebCore::Frame*);
     44    FileButton(WebCore::Frame*);
    4545   
    4646    void setFilename(const DeprecatedString &);

  • trunk/WebCore/kwq/FileButton.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQFileButton.h"
     27#import "FileButton.h"
    2828
    2929#import "BlockExceptions.h"
    … …  
    5656@interface WebFileChooserButton : NSButton
    5757{
    58     KWQFileButton *_widget;
    59 }
    60 - (id)initWithWidget:(KWQFileButton *)widget;
     58    FileButton *_widget;
     59}
     60- (id)initWithWidget:(FileButton *)widget;
    6161@end
    6262
    … …  
    6868    NSString *_label;
    6969    BOOL _inNextValidKeyView;
    70     KWQFileButton *_widget;
     70    FileButton *_widget;
    7171    BOOL _isCurrentDragTarget;
    7272}
    … …  
    7878- (NSRect)visualFrame;
    7979- (NSSize)bestVisualFrameSizeForCharacterCount:(int)count;
    80 - (id)initWithWidget:(KWQFileButton *)widget;
     80- (id)initWithWidget:(FileButton *)widget;
    8181- (void)setEnabled:(BOOL)flag;
    8282@end
    … …  
    9090}
    9191
    92 - (id)initWithWidget:(KWQFileButton*)widget
     92- (id)initWithWidget:(FileButton*)widget
    9393{
    9494    self = [super init];
    … …  
    331331{
    332332    return _inNextValidKeyView
    333     ? FrameMac::nextKeyViewForWidget(_widget, KWQSelectingNext)
     333    ? FrameMac::nextKeyViewForWidget(_widget, SelectingNext)
    334334    : [super nextKeyView];
    335335}
    … …  
    338338{
    339339    return _inNextValidKeyView
    340     ? FrameMac::nextKeyViewForWidget(_widget, KWQSelectingPrevious)
     340    ? FrameMac::nextKeyViewForWidget(_widget, SelectingPrevious)
    341341    : [super previousKeyView];
    342342}
    … …  
    414414@implementation WebFileChooserButton
    415415
    416 - (id)initWithWidget:(KWQFileButton *)widget
     416- (id)initWithWidget:(FileButton *)widget
    417417{
    418418    [super init];
    … …  
    441441
    442442
    443 KWQFileButton::KWQFileButton(Frame *frame)
     443FileButton::FileButton(Frame *frame)
    444444{
    445445    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    452452}
    453453
    454 void KWQFileButton::setFilename(const DeprecatedString &f)
     454void FileButton::setFilename(const DeprecatedString &f)
    455455{
    456456    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    459459}
    460460
    461 void KWQFileButton::click(bool sendMouseEvents)
     461void FileButton::click(bool sendMouseEvents)
    462462{
    463463    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    466466}
    467467
    468 IntSize KWQFileButton::sizeForCharacterWidth(int characters) const
     468IntSize FileButton::sizeForCharacterWidth(int characters) const
    469469{
    470470    ASSERT(characters > 0);
    … …  
    478478}
    479479
    480 IntRect KWQFileButton::frameGeometry() const
     480IntRect FileButton::frameGeometry() const
    481481{
    482482    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    486486}
    487487
    488 void KWQFileButton::setFrameGeometry(const IntRect &rect)
     488void FileButton::setFrameGeometry(const IntRect &rect)
    489489{
    490490    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    493493}
    494494
    495 int KWQFileButton::baselinePosition(int height) const
     495int FileButton::baselinePosition(int height) const
    496496{
    497497    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    502502}
    503503
    504 Widget::FocusPolicy KWQFileButton::focusPolicy() const
     504Widget::FocusPolicy FileButton::focusPolicy() const
    505505{
    506506    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    516516}
    517517
    518 void KWQFileButton::filenameChanged(const DeprecatedString& filename)
     518void FileButton::filenameChanged(const DeprecatedString& filename)
    519519{
    520520    m_name = filename;
    … …  
    523523}
    524524
    525 void KWQFileButton::setDisabled(bool flag)
     525void FileButton::setDisabled(bool flag)
    526526{
    527527    BEGIN_BLOCK_OBJC_EXCEPTIONS;

  • trunk/WebCore/kwq/FormDataMac.mm

    r15251 r15253  
    2525
    2626#include "config.h"
    27 #import "KWQFormData.h"
     27#import "FormDataMac.h"
    2828
    2929#import <wtf/Assertions.h>

  • trunk/WebCore/kwq/ListBox.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef KWQLISTBOX_H_
    27 #define KWQLISTBOX_H_
     26#ifndef ListBox_h
     27#define ListBox_h
    2828
    2929#include "DeprecatedValueList.h"
    … …  
    3232#include "TextDirection.h"
    3333
    34 enum KWQListBoxItemType {
    35     KWQListBoxOption,
    36     KWQListBoxGroupLabel,
    37     KWQListBoxSeparator
     34enum ListBoxItemType {
     35    ListBoxOption,
     36    ListBoxGroupLabel,
     37    ListBoxSeparator
    3838};
    3939
    40 struct KWQListBoxItem
     40struct ListBoxItem
    4141{
    4242    DeprecatedString string;
    43     KWQListBoxItemType type;
     43    ListBoxItemType type;
    4444    bool enabled;
    4545   
    46     KWQListBoxItem(const DeprecatedString &s, KWQListBoxItemType t, bool e) : string(s), type(t), enabled(e) { }
     46    ListBoxItem(const DeprecatedString &s, ListBoxItemType t, bool e) : string(s), type(t), enabled(e) { }
    4747};
    4848
    49 class QListBox : public WebCore::ScrollView {
     49class ListBox : public WebCore::ScrollView {
    5050public:
    5151    enum SelectionMode { Single, Extended };
    5252
    53     QListBox();
    54     ~QListBox();
     53    ListBox();
     54    ~ListBox();
    5555
    5656    IntSize sizeForNumberOfLines(int numLines) const;
    … …  
    6161
    6262    void clear();
    63     void appendItem(const DeprecatedString &s, bool enabled) { appendItem(s, KWQListBoxOption, enabled); }
    64     void appendGroupLabel(const DeprecatedString &s, bool enabled) { appendItem(s, KWQListBoxGroupLabel, enabled); }
     63    void appendItem(const DeprecatedString &s, bool enabled) { appendItem(s, ListBoxOption, enabled); }
     64    void appendGroupLabel(const DeprecatedString &s, bool enabled) { appendItem(s, ListBoxGroupLabel, enabled); }
    6565    void doneAppendingItems();
    6666
    … …  
    7171    bool isEnabled();
    7272   
    73     const KWQListBoxItem &itemAtIndex(int index) const { return _items[index]; }
     73    const ListBoxItem &itemAtIndex(int index) const { return _items[index]; }
    7474   
    7575    void setWritingDirection(WebCore::TextDirection);
    … …  
    8484
    8585private:
    86     void appendItem(const DeprecatedString &, KWQListBoxItemType, bool);
     86    void appendItem(const DeprecatedString &, ListBoxItemType, bool);
    8787
    88     // A Vector<KWQListBoxItem> might be more efficient for large lists.
    89     DeprecatedValueList<KWQListBoxItem> _items;
     88    // A Vector<ListBoxItem> might be more efficient for large lists.
     89    DeprecatedValueList<ListBoxItem> _items;
    9090
    9191    bool _changingSelection;

  • trunk/WebCore/kwq/ListBox.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQListBox.h"
     27#import "ListBox.h"
    2828
    2929#import "BlockExceptions.h"
    … …  
    4444const float rightMargin = 2;
    4545
    46 @interface KWQListBoxScrollView : NSScrollView <WebCoreWidgetHolder>
     46@interface WebCoreListBoxScrollView : NSScrollView <WebCoreWidgetHolder>
    4747@end
    4848
    49 @interface KWQTableView : NSTableView <WebCoreWidgetHolder>
     49@interface WebCoreTableView : NSTableView <WebCoreWidgetHolder>
    5050{
    5151@public
    52     QListBox *_box;
     52    ListBox *_box;
    5353    BOOL processingMouseEvent;
    5454    BOOL clickedDuringMouseEvent;
    … …  
    5858    UCTypeSelectRef typeSelectSelector;
    5959}
    60 - (id)initWithListBox:(QListBox *)b;
     60- (id)initWithListBox:(ListBox *)b;
    6161- (void)detach;
    62 - (void)_KWQ_setKeyboardFocusRingNeedsDisplay;
     62- (void)_webcore_setKeyboardFocusRingNeedsDisplay;
    6363- (Widget *)widget;
    6464- (void)setBaseWritingDirection:(NSWritingDirection)direction;
    … …  
    112112}
    113113
    114 QListBox::QListBox()
     114ListBox::ListBox()
    115115    : _changingSelection(false)
    116116    , _enabled(true)
    … …  
    119119    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    120120
    121     NSScrollView *scrollView = [[KWQListBoxScrollView alloc] initWithFrame:NSZeroRect];
     121    NSScrollView *scrollView = [[WebCoreListBoxScrollView alloc] initWithFrame:NSZeroRect];
    122122    setView(scrollView);
    123123    [scrollView release];
    … …  
    141141    [[scrollView contentView] releaseGState];
    142142
    143     KWQTableView *tableView = [[KWQTableView alloc] initWithListBox:this];
     143    WebCoreTableView *tableView = [[WebCoreTableView alloc] initWithListBox:this];
    144144    [scrollView setDocumentView:tableView];
    145145    [tableView release];
    … …  
    149149}
    150150
    151 QListBox::~QListBox()
     151ListBox::~ListBox()
    152152{
    153153    NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
    154154   
    155155    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    156     KWQTableView *tableView = [scrollView documentView];
     156    WebCoreTableView *tableView = [scrollView documentView];
    157157    [tableView detach];
    158158    END_BLOCK_OBJC_EXCEPTIONS;
    159159}
    160160
    161 void QListBox::clear()
     161void ListBox::clear()
    162162{
    163163    _items.clear();
    … …  
    165165}
    166166
    167 void QListBox::setSelectionMode(SelectionMode mode)
     167void ListBox::setSelectionMode(SelectionMode mode)
    168168{
    169169    NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
    … …  
    175175}
    176176
    177 void QListBox::appendItem(const DeprecatedString &text, KWQListBoxItemType type, bool enabled)
    178 {
    179     _items.append(KWQListBoxItem(text, type, enabled));
     177void ListBox::appendItem(const DeprecatedString &text, ListBoxItemType type, bool enabled)
     178{
     179    _items.append(ListBoxItem(text, type, enabled));
    180180    _widthGood = false;
    181181}
    182182
    183 void QListBox::doneAppendingItems()
     183void ListBox::doneAppendingItems()
    184184{
    185185    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    192192}
    193193
    194 void QListBox::setSelected(int index, bool selectIt)
     194void ListBox::setSelected(int index, bool selectIt)
    195195{
    196196    ASSERT(index >= 0);
    … …  
    213213}
    214214
    215 bool QListBox::isSelected(int index) const
     215bool ListBox::isSelected(int index) const
    216216{
    217217    ASSERT(index >= 0);
    … …  
    228228}
    229229
    230 void QListBox::setEnabled(bool enabled)
     230void ListBox::setEnabled(bool enabled)
    231231{
    232232    if (enabled != _enabled) {
    … …  
    245245}
    246246
    247 bool QListBox::isEnabled()
     247bool ListBox::isEnabled()
    248248{
    249249    return _enabled;
    250250}
    251251
    252 IntSize QListBox::sizeForNumberOfLines(int lines) const
     252IntSize ListBox::sizeForNumberOfLines(int lines) const
    253253{
    254254    NSSize size = {0,0};
    … …  
    257257
    258258    NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
    259     KWQTableView *tableView = [scrollView documentView];
     259    WebCoreTableView *tableView = [scrollView documentView];
    260260   
    261261    if (!_widthGood) {
    262262        float width = 0;
    263         DeprecatedValueListConstIterator<KWQListBoxItem> i = const_cast<const DeprecatedValueList<KWQListBoxItem> &>(_items).begin();
    264         DeprecatedValueListConstIterator<KWQListBoxItem> e = const_cast<const DeprecatedValueList<KWQListBoxItem> &>(_items).end();
     263        DeprecatedValueListConstIterator<ListBoxItem> i = const_cast<const DeprecatedValueList<ListBoxItem> &>(_items).begin();
     264        DeprecatedValueListConstIterator<ListBoxItem> e = const_cast<const DeprecatedValueList<ListBoxItem> &>(_items).end();
    265265        if (i != e) {
    266266            WebCore::TextStyle style;
    … …  
    287287                const DeprecatedString &s = (*i).string;
    288288                TextRun run(reinterpret_cast<const UniChar *>(s.unicode()), s.length(), 0, s.length());
    289                 float textWidth = (((*i).type == KWQListBoxGroupLabel) ? groupLabelRenderer : renderer)->floatWidth(run, style);
     289                float textWidth = (((*i).type == ListBoxGroupLabel) ? groupLabelRenderer : renderer)->floatWidth(run, style);
    290290                width = max(width, textWidth);
    291291                ++i;
    … …  
    309309}
    310310
    311 Widget::FocusPolicy QListBox::focusPolicy() const
     311Widget::FocusPolicy ListBox::focusPolicy() const
    312312{
    313313    FocusPolicy policy = Widget::focusPolicy();
    … …  
    315315}
    316316
    317 bool QListBox::checksDescendantsForFocus() const
     317bool ListBox::checksDescendantsForFocus() const
    318318{
    319319    return true;
    320320}
    321321
    322 void QListBox::setWritingDirection(TextDirection d)
     322void ListBox::setWritingDirection(TextDirection d)
    323323{
    324324    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    325325
    326326    NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
    327     KWQTableView *tableView = [scrollView documentView];
     327    WebCoreTableView *tableView = [scrollView documentView];
    328328    NSWritingDirection direction = d == RTL ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight;
    329329    if ([tableView baseWritingDirection] != direction) {
    … …  
    335335}
    336336
    337 void QListBox::clearCachedTextRenderers()
     337void ListBox::clearCachedTextRenderers()
    338338{
    339339    delete itemScreenRenderer;
    … …  
    350350}
    351351
    352 void QListBox::setFont(const Font& font)
     352void ListBox::setFont(const Font& font)
    353353{
    354354    Widget::setFont(font);
    355355
    356356    NSScrollView *scrollView = static_cast<NSScrollView *>(getView());
    357     KWQTableView *tableView = [scrollView documentView];
     357    WebCoreTableView *tableView = [scrollView documentView];
    358358    [tableView fontChanged];
    359359}
    360360
    361 @implementation KWQListBoxScrollView
     361@implementation WebCoreListBoxScrollView
    362362
    363363- (Widget *)widget
    364364{
    365     KWQTableView *tableView = [self documentView];
    366    
    367     assert([tableView isKindOfClass:[KWQTableView class]]);
     365    WebCoreTableView *tableView = [self documentView];
     366   
     367    assert([tableView isKindOfClass:[WebCoreTableView class]]);
    368368   
    369369    return [tableView widget];
    … …  
    381381- (BOOL)becomeFirstResponder
    382382{
    383     KWQTableView *documentView = [self documentView];
     383    WebCoreTableView *documentView = [self documentView];
    384384    Widget *widget = [documentView widget];
    385385    [FrameMac::bridgeForWidget(widget) makeFirstResponder:documentView];
    … …  
    394394@end
    395395
    396 static Boolean KWQTableViewTypeSelectCallback(UInt32 index, void *listDataPtr, void *refcon, CFStringRef *outString, UCTypeSelectOptions *tsOptions)
    397 {
    398     KWQTableView *self = static_cast<KWQTableView *>(refcon);   
    399     QListBox *box = static_cast<QListBox *>([self widget]);
     396static Boolean ListBoxTypeSelectCallback(UInt32 index, void *listDataPtr, void *refcon, CFStringRef *outString, UCTypeSelectOptions *tsOptions)
     397{
     398    WebCoreTableView *self = static_cast<WebCoreTableView *>(refcon);   
     399    ListBox *box = static_cast<ListBox *>([self widget]);
    400400   
    401401    if (!box)
    … …  
    414414}
    415415
    416 @implementation KWQTableView
    417 
    418 - (id)initWithListBox:(QListBox *)b
     416@implementation WebCoreTableView
     417
     418- (id)initWithListBox:(ListBox *)b
    419419{
    420420    [super init];
    … …  
    536536        UInt32 closestItem = 0;
    537537       
    538         err = UCTypeSelectFindItem(typeSelectSelector, [self numberOfRowsInTableView:self], 0, self, KWQTableViewTypeSelectCallback, &closestItem);
     538        err = UCTypeSelectFindItem(typeSelectSelector, [self numberOfRowsInTableView:self], 0, self, ListBoxTypeSelectCallback, &closestItem);
    539539
    540540        if (err)
    … …  
    558558        if (_box && _box->client() && !FrameMac::currentEventIsMouseDownInWidget(_box))
    559559            _box->client()->scrollToVisible(_box);
    560         [self _KWQ_setKeyboardFocusRingNeedsDisplay];
     560        [self _webcore_setKeyboardFocusRingNeedsDisplay];
    561561        if (_box && _box->client()) {
    562562            _box->client()->focusIn(_box);
    … …  
    588588{
    589589    return _box && inNextValidKeyView
    590         ? FrameMac::nextKeyViewForWidget(_box, KWQSelectingNext)
     590        ? FrameMac::nextKeyViewForWidget(_box, SelectingNext)
    591591        : [super nextKeyView];
    592592}
    … …  
    595595{
    596596    return _box && inNextValidKeyView
    597         ? FrameMac::nextKeyViewForWidget(_box, KWQSelectingPrevious)
     597        ? FrameMac::nextKeyViewForWidget(_box, SelectingPrevious)
    598598        : [super previousKeyView];
    599599}
    … …  
    644644        return NO;
    645645   
    646     const KWQListBoxItem &item = _box->itemAtIndex(row);
    647    
    648     return item.type == KWQListBoxOption && item.enabled;
     646    const ListBoxItem &item = _box->itemAtIndex(row);
     647   
     648    return item.type == ListBoxOption && item.enabled;
    649649}
    650650
    … …  
    660660    }
    661661
    662     const KWQListBoxItem &item = _box->itemAtIndex(row);
     662    const ListBoxItem &item = _box->itemAtIndex(row);
    663663
    664664    NSColor *color;
    … …  
    678678    const Font* renderer;
    679679    if (isSystemFont) {
    680         renderer = (item.type == KWQListBoxGroupLabel) ? groupLabelTextRenderer() : itemTextRenderer();
     680        renderer = (item.type == ListBoxGroupLabel) ? groupLabelTextRenderer() : itemTextRenderer();
    681681    } else {
    682         if (item.type == KWQListBoxGroupLabel) {
     682        if (item.type == ListBoxGroupLabel) {
    683683            deleteRenderer = true;
    684684            FontDescription boldDesc = _box->font().fontDescription();
    … …  
    713713}
    714714
    715 - (void)_KWQ_setKeyboardFocusRingNeedsDisplay
     715- (void)_webcore_setKeyboardFocusRingNeedsDisplay
    716716{
    717717    [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];

  • trunk/WebCore/kwq/LoaderFunctions.h

    r15251 r15253  
    5353}
    5454
    55 Vector<char> KWQServeSynchronousRequest(WebCore::Loader*, WebCore::DocLoader*, WebCore::TransferJob*, KURL& finalURL, DeprecatedString& headers);
     55Vector<char> ServeSynchronousRequest(WebCore::Loader*, WebCore::DocLoader*, WebCore::TransferJob*, KURL& finalURL, DeprecatedString& headers);
    5656
    57 void KWQCheckCacheObjectStatus(WebCore::DocLoader*, WebCore::CachedObject*);
    58 bool KWQCheckIfReloading(WebCore::DocLoader*);
    59 bool KWQIsResponseURLEqualToURL(NSURLResponse*, const WebCore::String& m_url);
    60 DeprecatedString KWQResponseURL(NSURLResponse *response);
    61 DeprecatedString KWQResponseMIMEType(NSURLResponse *response);
    62 bool KWQResponseIsMultipart(NSURLResponse *response);
    63 int KWQNumberOfPendingOrLoadingRequests(WebCore::DocLoader*);
    64 time_t KWQCacheObjectExpiresTime(WebCore::DocLoader*, NSURLResponse*);
    65 NSString* KWQHeaderStringFromDictionary(NSDictionary* headers, int statusCode);
     57void CheckCacheObjectStatus(WebCore::DocLoader*, WebCore::CachedObject*);
     58bool CheckIfReloading(WebCore::DocLoader*);
     59bool IsResponseURLEqualToURL(NSURLResponse*, const WebCore::String& m_url);
     60DeprecatedString ResponseURL(NSURLResponse *response);
     61DeprecatedString ResponseMIMEType(NSURLResponse *response);
     62bool ResponseIsMultipart(NSURLResponse *response);
     63int NumberOfPendingOrLoadingRequests(WebCore::DocLoader*);
     64time_t CacheObjectExpiresTime(WebCore::DocLoader*, NSURLResponse*);
     65NSString* HeaderStringFromDictionary(NSDictionary* headers, int statusCode);

  • trunk/WebCore/kwq/LoaderFunctions.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQLoader.h"
     27#import "LoaderFunctions.h"
    2828
    2929#import "BlockExceptions.h"
    … …  
    3333#import "FoundationExtras.h"
    3434#import "FrameMac.h"
    35 #import "KWQFormData.h"
    36 #import "KWQResourceLoader.h"
     35#import "FormDataMac.h"
     36#import "WebCoreResourceLoaderImp.h"
    3737#import "Logging.h"
    3838#import "Request.h"
    … …  
    9696@end
    9797
    98 NSString *KWQHeaderStringFromDictionary(NSDictionary *headers, int statusCode)
     98NSString *HeaderStringFromDictionary(NSDictionary *headers, int statusCode)
    9999{
    100100    NSMutableString *headerString = [[[NSMutableString alloc] init] autorelease];
    … …  
    120120}
    121121
    122 Vector<char> KWQServeSynchronousRequest(Loader *loader, DocLoader *docLoader, TransferJob *job, KURL &finalURL, DeprecatedString &responseHeaders)
     122Vector<char> ServeSynchronousRequest(Loader *loader, DocLoader *docLoader, TransferJob *job, KURL &finalURL, DeprecatedString &responseHeaders)
    123123{
    124124    FrameMac *frame = static_cast<FrameMac *>(docLoader->frame());
    … …  
    152152
    153153    finalURL = finalNSURL;
    154     responseHeaders = DeprecatedString::fromNSString(KWQHeaderStringFromDictionary(responseHeaderDict, statusCode));
     154    responseHeaders = DeprecatedString::fromNSString(HeaderStringFromDictionary(responseHeaderDict, statusCode));
    155155
    156156    Vector<char> results([resultData length]);
    … …  
    165165}
    166166
    167 int KWQNumberOfPendingOrLoadingRequests(WebCore::DocLoader *dl)
     167int NumberOfPendingOrLoadingRequests(WebCore::DocLoader *dl)
    168168{
    169169    return WebCore::Cache::loader()->numRequests(dl);
    170170}
    171171
    172 bool KWQCheckIfReloading(DocLoader *loader)
     172bool CheckIfReloading(DocLoader *loader)
    173173{
    174174    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    180180}
    181181
    182 void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
     182void CheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
    183183{
    184184    // Return from the function for objects that we didn't load from the cache.
    … …  
    215215}
    216216
    217 bool KWQIsResponseURLEqualToURL(NSURLResponse *response, const WebCore::String& m_url)
     217bool IsResponseURLEqualToURL(NSURLResponse *response, const WebCore::String& m_url)
    218218{
    219219    NSURL *responseURL = [(NSURLResponse *)response URL];
    … …  
    229229}
    230230
    231 DeprecatedString KWQResponseURL(NSURLResponse *response)
     231DeprecatedString ResponseURL(NSURLResponse *response)
    232232{
    233233    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    245245}
    246246
    247 DeprecatedString KWQResponseMIMEType(NSURLResponse *response)
     247DeprecatedString ResponseMIMEType(NSURLResponse *response)
    248248{
    249249    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    254254}
    255255
    256 bool KWQResponseIsMultipart(NSURLResponse *response)
     256bool ResponseIsMultipart(NSURLResponse *response)
    257257{
    258258    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    263263}
    264264
    265 time_t KWQCacheObjectExpiresTime(WebCore::DocLoader *docLoader, NSURLResponse *response)
     265time_t CacheObjectExpiresTime(WebCore::DocLoader *docLoader, NSURLResponse *response)
    266266{
    267267    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    282282void CachedObject::setResponse(NSURLResponse *response)
    283283{
    284     KWQRetain(response);
    285     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    286     KWQRelease(m_response);
     284    HardRetain(response);
     285    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     286    HardRelease(m_response);
    287287    END_BLOCK_OBJC_EXCEPTIONS;
    288288
    … …  
    292292void CachedObject::setAllData(NSData *allData)
    293293{
    294     KWQRetain(allData);
    295     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    296     KWQRelease(m_allData);
     294    HardRetain(allData);
     295    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     296    HardRelease(m_allData);
    297297    END_BLOCK_OBJC_EXCEPTIONS;
    298298

  • trunk/WebCore/kwq/PopUpButton.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef QCOMBOBOX_H_
    27 #define QCOMBOBOX_H_
     26#ifndef PopUpButton_h
     27#define PopUpButton_h
    2828
    29 #include "KWQListBox.h"
     29#include "ListBox.h"
    3030
    3131#ifdef __OBJC__
    32 @class KWQComboBoxAdapter;
     32@class WebCorePopUpButtonAdapter;
    3333#else
    34 class KWQComboBoxAdapter;
     34class WebCorePopUpButtonAdapter;
    3535class NSMenuItem;
    3636class NSFont;
    3737#endif
    3838
    39 class QComboBox : public Widget {
     39class PopUpButton : public Widget {
    4040public: 
    41     QComboBox();
    42     ~QComboBox();
     41    PopUpButton();
     42    ~PopUpButton();
    4343   
    4444    void clear();
    45     void appendItem(const DeprecatedString &text, bool enabled) { appendItem(text, KWQListBoxOption, enabled); }
    46     void appendGroupLabel(const DeprecatedString &text) { appendItem(text, KWQListBoxGroupLabel, false); }
    47     void appendSeparator() { appendItem(DeprecatedString::null, KWQListBoxSeparator, true); }
     45    void appendItem(const DeprecatedString &text, bool enabled) { appendItem(text, ListBoxOption, enabled); }
     46    void appendGroupLabel(const DeprecatedString &text) { appendItem(text, ListBoxGroupLabel, false); }
     47    void appendSeparator() { appendItem(DeprecatedString::null, ListBoxSeparator, true); }
    4848
    4949    int currentItem() const { return _currentItem; }
    … …  
    6666   
    6767private:
    68     void appendItem(const DeprecatedString &, KWQListBoxItemType, bool);
     68    void appendItem(const DeprecatedString &, ListBoxItemType, bool);
    6969    const int *dimensions() const;
    7070    NSFont *labelFont() const;
    71     void setTitle(NSMenuItem *, const KWQListBoxItem &);
     71    void setTitle(NSMenuItem *, const ListBoxItem &);
    7272   
    7373    mutable int _width;
    … …  
    7676    mutable int _currentItem;
    7777
    78     // A Vector<KWQListBoxItem> may be more efficient for large menus.
    79     DeprecatedValueList<KWQListBoxItem> _items;
     78    // A Vector<ListBoxItem> may be more efficient for large menus.
     79    DeprecatedValueList<ListBoxItem> _items;
    8080    mutable bool _menuPopulated;
    8181

  • trunk/WebCore/kwq/PopUpButton.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQComboBox.h"
     27#import "PopUpButton.h"
    2828
    2929#import "BlockExceptions.h"
    3030#import "FoundationExtras.h"
    3131#import "FrameMac.h"
    32 #import "KWQLineEdit.h"
     32#import "TextField.h"
    3333#import "WebCoreFrameBridge.h"
    3434#import "FontData.h"
    … …  
    3939using namespace WebCore;
    4040
    41 @interface NSCell (KWQComboBoxKnowsAppKitSecrets)
     41@interface NSCell (WebCorePopUpButtonKnowsAppKitSecrets)
    4242- (NSMutableDictionary *)_textAttributes;
    4343@end
    … …  
    5353};
    5454
    55 @interface KWQPopUpButtonCell : NSPopUpButtonCell <WebCoreWidgetHolder>
    56 {
    57     QComboBox *box;
     55@interface WebCorePopUpButtonCell : NSPopUpButtonCell <WebCoreWidgetHolder>
     56{
     57    PopUpButton *box;
    5858    NSWritingDirection baseWritingDirection;
    5959}
    60 - (id)initWithQComboBox:(QComboBox *)b;
     60- (id)initWithQComboBox:(PopUpButton *)b;
    6161- (void)detachQComboBox;
    6262- (void)setBaseWritingDirection:(NSWritingDirection)direction;
    … …  
    6464@end
    6565
    66 @interface KWQPopUpButton : NSPopUpButton <WebCoreWidgetHolder>
     66@interface WebCorePopUpButton : NSPopUpButton <WebCoreWidgetHolder>
    6767{
    6868    BOOL inNextValidKeyView;
    … …  
    7373@end
    7474
    75 QComboBox::QComboBox()
     75PopUpButton::PopUpButton()
    7676    : _widthGood(false)
    7777    , _currentItem(0)
    … …  
    8181    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    8282
    83     KWQPopUpButton *button = [[KWQPopUpButton alloc] init];
     83    WebCorePopUpButton *button = [[WebCorePopUpButton alloc] init];
    8484    setView(button);
    8585    [button release];
    8686   
    87     KWQPopUpButtonCell *cell = [[KWQPopUpButtonCell alloc] initWithQComboBox:this];
     87    WebCorePopUpButtonCell *cell = [[WebCorePopUpButtonCell alloc] initWithQComboBox:this];
    8888    // Work around problem where the pop-up menu gets a "..." in it
    8989    // by turning off the default "ellipsizing" behavior.
    … …  
    102102}
    103103
    104 QComboBox::~QComboBox()
    105 {
    106     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    107 
    108     KWQPopUpButton *button = (KWQPopUpButton *)getView();
     104PopUpButton::~PopUpButton()
     105{
     106    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     107
     108    WebCorePopUpButton *button = (WebCorePopUpButton *)getView();
    109109    [button setTarget:nil];
    110110    [[button cell] detachQComboBox];
    111     KWQRelease(_labelFont);
    112 
    113     END_BLOCK_OBJC_EXCEPTIONS;
    114 }
    115 
    116 void QComboBox::setTitle(NSMenuItem *menuItem, const KWQListBoxItem &title)
    117 {
    118     if (title.type == KWQListBoxGroupLabel) {
     111    HardRelease(_labelFont);
     112
     113    END_BLOCK_OBJC_EXCEPTIONS;
     114}
     115
     116void PopUpButton::setTitle(NSMenuItem *menuItem, const ListBoxItem &title)
     117{
     118    if (title.type == ListBoxGroupLabel) {
    119119        NSDictionary *attributes = [[NSDictionary alloc] initWithObjectsAndKeys:labelFont(), NSFontAttributeName, nil];
    120120        NSAttributedString *string = [[NSAttributedString alloc] initWithString:title.string.getNSString() attributes:attributes];
    … …  
    129129}
    130130
    131 void QComboBox::appendItem(const DeprecatedString &text, KWQListBoxItemType type, bool enabled)
    132 {
    133     const KWQListBoxItem listItem(text, type, enabled);
     131void PopUpButton::appendItem(const DeprecatedString &text, ListBoxItemType type, bool enabled)
     132{
     133    const ListBoxItem listItem(text, type, enabled);
    134134    _items.append(listItem);
    135135    if (_menuPopulated) {
    136         KWQPopUpButton *button = (KWQPopUpButton *)getView();
     136        WebCorePopUpButton *button = (WebCorePopUpButton *)getView();
    137137        if (![[button cell] isHighlighted]) {
    138138            _menuPopulated = false;
    139139        } else {
    140140            BEGIN_BLOCK_OBJC_EXCEPTIONS;
    141             if (type == KWQListBoxSeparator) {
     141            if (type == ListBoxSeparator) {
    142142                NSMenuItem *separator = [NSMenuItem separatorItem];
    143143                [[button menu] addItem:separator];
    … …  
    155155}
    156156
    157 IntSize QComboBox::sizeHint() const
    158 {
    159     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    160 
    161     KWQPopUpButton *button = (KWQPopUpButton *)getView();
     157IntSize PopUpButton::sizeHint() const
     158{
     159    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     160
     161    WebCorePopUpButton *button = (WebCorePopUpButton *)getView();
    162162   
    163163    if (!_widthGood) {
    164164        float width = 0;
    165         DeprecatedValueListConstIterator<KWQListBoxItem> i = const_cast<const DeprecatedValueList<KWQListBoxItem> &>(_items).begin();
    166         DeprecatedValueListConstIterator<KWQListBoxItem> e = const_cast<const DeprecatedValueList<KWQListBoxItem> &>(_items).end();
     165        DeprecatedValueListConstIterator<ListBoxItem> i = const_cast<const DeprecatedValueList<ListBoxItem> &>(_items).begin();
     166        DeprecatedValueListConstIterator<ListBoxItem> e = const_cast<const DeprecatedValueList<ListBoxItem> &>(_items).end();
    167167        if (i != e) {
    168168            FontPlatformData itemFont([button font], ![NSGraphicsContext currentContextDrawingToScreen]);
    … …  
    172172            do {
    173173                const DeprecatedString &s = (*i).string;
    174                 bool isGroupLabel = ((*i).type == KWQListBoxGroupLabel);
     174                bool isGroupLabel = ((*i).type == ListBoxGroupLabel);
    175175                ++i;
    176176
    … …  
    195195}
    196196
    197 IntRect QComboBox::frameGeometry() const
     197IntRect PopUpButton::frameGeometry() const
    198198{
    199199    IntRect r = Widget::frameGeometry();
    … …  
    203203}
    204204
    205 void QComboBox::setFrameGeometry(const IntRect& r)
     205void PopUpButton::setFrameGeometry(const IntRect& r)
    206206{
    207207    Widget::setFrameGeometry(IntRect(-dimensions()[leftMargin] + r.x(), -dimensions()[topMargin] + r.y(),
    … …  
    210210}
    211211
    212 int QComboBox::baselinePosition(int height) const
     212int PopUpButton::baselinePosition(int height) const
    213213{
    214214    // Menu text is at the top.
    215     KWQPopUpButton *button = (KWQPopUpButton *)getView();
     215    WebCorePopUpButton *button = (WebCorePopUpButton *)getView();
    216216    return static_cast<int>(ceilf(-dimensions()[topMargin] + dimensions()[baselineFudgeFactor] + [[button font] ascender]));
    217217}
    218218
    219 void QComboBox::clear()
    220 {
    221     KWQPopUpButton *button = (KWQPopUpButton *)getView();
     219void PopUpButton::clear()
     220{
     221    WebCorePopUpButton *button = (WebCorePopUpButton *)getView();
    222222    [button removeAllItems];
    223223    _widthGood = false;
    … …  
    227227}
    228228
    229 void QComboBox::setCurrentItem(int index)
     229void PopUpButton::setCurrentItem(int index)
    230230{
    231231    ASSERT(index < (int)_items.count());
    … …  
    233233    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    234234
    235     KWQPopUpButton *button = (KWQPopUpButton *)getView();
     235    WebCorePopUpButton *button = (WebCorePopUpButton *)getView();
    236236    if (_menuPopulated) {
    237237        [button selectItemAtIndex:index];
    … …  
    248248}
    249249
    250 void QComboBox::itemSelected()
     250void PopUpButton::itemSelected()
    251251{
    252252    ASSERT(_menuPopulated);
    … …  
    254254    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    255255
    256     KWQPopUpButton *button = (KWQPopUpButton *)getView();
     256    WebCorePopUpButton *button = (WebCorePopUpButton *)getView();
    257257    int i = [button indexOfSelectedItem];
    258258    if (_currentItem == i) {
    … …  
    267267}
    268268
    269 void QComboBox::setFont(const Font& f)
     269void PopUpButton::setFont(const Font& f)
    270270{
    271271    Widget::setFont(f);
    272272
    273     const NSControlSize size = KWQNSControlSizeForFont(f);
     273    const NSControlSize size = ControlSizeForFont(f);
    274274    NSControl * const button = static_cast<NSControl *>(getView());
    275275
    … …  
    279279        [[button cell] setControlSize:size];
    280280        [button setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:size]]];
    281         KWQRelease(_labelFont);
     281        HardRelease(_labelFont);
    282282        _labelFont = nil;
    283283        _widthGood = false;
    … …  
    287287}
    288288
    289 NSFont *QComboBox::labelFont() const
     289NSFont *PopUpButton::labelFont() const
    290290{
    291291    if (_labelFont == nil) {
    292292        NSControl * const button = static_cast<NSControl *>(getView());
    293         _labelFont = KWQRetain([NSFont boldSystemFontOfSize:[[button font] pointSize]]);
     293        _labelFont = HardRetain([NSFont boldSystemFontOfSize:[[button font] pointSize]]);
    294294    }
    295295    return _labelFont;
    296296}
    297297
    298 const int *QComboBox::dimensions() const
     298const int *PopUpButton::dimensions() const
    299299{
    300300    // We empirically determined these dimensions.
    … …  
    314314}
    315315
    316 Widget::FocusPolicy QComboBox::focusPolicy() const
     316Widget::FocusPolicy PopUpButton::focusPolicy() const
    317317{
    318318    FocusPolicy policy = Widget::focusPolicy();
    … …  
    320320}
    321321
    322 void QComboBox::setWritingDirection(TextDirection direction)
    323 {
    324     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    325 
    326     KWQPopUpButton *button = static_cast<KWQPopUpButton *>(getView());
    327     KWQPopUpButtonCell *cell = [button cell];
     322void PopUpButton::setWritingDirection(TextDirection direction)
     323{
     324    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     325
     326    WebCorePopUpButton *button = static_cast<WebCorePopUpButton *>(getView());
     327    WebCorePopUpButtonCell *cell = [button cell];
    328328    NSWritingDirection d = direction == RTL ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight;
    329329    if ([cell baseWritingDirection] != d) {
    … …  
    335335}
    336336
    337 void QComboBox::populateMenu()
     337void PopUpButton::populateMenu()
    338338{
    339339    if (!_menuPopulated) {
    340340        BEGIN_BLOCK_OBJC_EXCEPTIONS;
    341341
    342         KWQPopUpButton *button = static_cast<KWQPopUpButton *>(getView());
     342        WebCorePopUpButton *button = static_cast<WebCorePopUpButton *>(getView());
    343343        [button setPopulatingMenu:YES];
    344344        [button removeAllItems];
    345         DeprecatedValueListConstIterator<KWQListBoxItem> i = const_cast<const DeprecatedValueList<KWQListBoxItem> &>(_items).begin();
    346         DeprecatedValueListConstIterator<KWQListBoxItem> e = const_cast<const DeprecatedValueList<KWQListBoxItem> &>(_items).end();
     345        DeprecatedValueListConstIterator<ListBoxItem> i = const_cast<const DeprecatedValueList<ListBoxItem> &>(_items).begin();
     346        DeprecatedValueListConstIterator<ListBoxItem> e = const_cast<const DeprecatedValueList<ListBoxItem> &>(_items).end();
    347347        for (; i != e; ++i) {
    348             if ((*i).type == KWQListBoxSeparator) {
     348            if ((*i).type == ListBoxSeparator) {
    349349                NSMenuItem *separator = [NSMenuItem separatorItem];
    350350                [[button menu] addItem:separator];
    … …  
    366366}
    367367
    368 void QComboBox::populate()
     368void PopUpButton::populate()
    369369{
    370370    populateMenu();
    371371}
    372372
    373 @implementation KWQPopUpButtonCell
    374 
    375 - (id)initWithQComboBox:(QComboBox *)b
     373@implementation WebCorePopUpButtonCell
     374
     375- (id)initWithQComboBox:(PopUpButton *)b
    376376{
    377377    box = b;
    … …  
    442442@end
    443443
    444 @implementation KWQPopUpButton
     444@implementation WebCorePopUpButton
    445445
    446446- (void)action:(id)sender
    447447{
    448     QComboBox *box = static_cast<QComboBox *>([self widget]);
     448    PopUpButton *box = static_cast<PopUpButton *>([self widget]);
    449449    if (box) {
    450450        box->itemSelected();
    … …  
    509509    Widget *widget = [self widget];
    510510    return widget && inNextValidKeyView
    511         ? FrameMac::nextKeyViewForWidget(widget, KWQSelectingNext)
     511        ? FrameMac::nextKeyViewForWidget(widget, SelectingNext)
    512512        : [super nextKeyView];
    513513}
    … …  
    517517    Widget *widget = [self widget];
    518518    return widget && inNextValidKeyView
    519         ? FrameMac::nextKeyViewForWidget(widget, KWQSelectingPrevious)
     519        ? FrameMac::nextKeyViewForWidget(widget, SelectingPrevious)
    520520        : [super previousKeyView];
    521521}

  • trunk/WebCore/kwq/SSLKeyGenerator.h

    r15251 r15253  
    3131class KURL;
    3232
    33 class KSSLKeyGen
     33class SSLKeyGenerator
    3434{
    3535public:

  • trunk/WebCore/kwq/SSLKeyGenerator.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQKSSLKeyGen.h"
     27#import "SSLKeyGenerator.h"
    2828
    2929#import "KURL.h"
    3030#import "WebCoreKeyGenerator.h"
    3131
    32 DeprecatedStringList KSSLKeyGen::supportedKeySizes()
     32DeprecatedStringList SSLKeyGenerator::supportedKeySizes()
    3333{
    3434    NSEnumerator *enumerator = [[[WebCoreKeyGenerator sharedGenerator] strengthMenuItemTitles] objectEnumerator];
    … …  
    4141}
    4242
    43 DeprecatedString KSSLKeyGen::signedPublicKeyAndChallengeString(unsigned keySizeIndex, const DeprecatedString &challengeString, const KURL &url)
     43DeprecatedString SSLKeyGenerator::signedPublicKeyAndChallengeString(unsigned keySizeIndex, const DeprecatedString &challengeString, const KURL &url)
    4444{   
    4545    return DeprecatedString::fromNSString([[WebCoreKeyGenerator sharedGenerator] signedPublicKeyAndChallengeStringWithStrengthIndex:keySizeIndex

  • trunk/WebCore/kwq/Settings.h

    r15251 r15253  
    3030#include "KURL.h"
    3131
    32 class KHTMLSettings
     32class Settings
    3333{
    3434public:
    35     KHTMLSettings()
     35    Settings()
    3636        : m_minimumFontSize(0)
    3737        , m_minimumLogicalFontSize(0)

  • trunk/WebCore/kwq/TextBox.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef QTEXTEDIT_H_
    27 #define QTEXTEDIT_H_
     26#ifndef TextBox_h
     27#define TextBox_h
    2828
    2929#include "GraphicsTypes.h"
    … …  
    3636}
    3737
    38 class QTextEdit : public WebCore::ScrollView {
     38class TextBox : public WebCore::ScrollView {
    3939 public:
    4040    typedef enum {
    … …  
    4747    } TextFormat;
    4848
    49     QTextEdit(WebCore::Widget* parent);
    50     ~QTextEdit();
     49    TextBox(WebCore::Widget* parent);
     50    ~TextBox();
    5151
    5252    void setColors(const WebCore::Color& background, const WebCore::Color& foreground);
    … …  
    9595};
    9696
    97 #endif /* QTEXTEDIT_H_ */
     97#endif /* TextBox_h */

  • trunk/WebCore/kwq/TextBox.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQTextEdit.h"
     27#import "TextBox.h"
    2828
    2929#import "Font.h"
    3030#import "IntSize.h"
    3131#import "BlockExceptions.h"
    32 #import "KWQLineEdit.h"
     32#import "TextField.h"
    3333#import "WebCoreTextArea.h"
    3434#import "WidgetClient.h"
    … …  
    3737using namespace WebCore;
    3838
    39 QTextEdit::QTextEdit(Widget *parent)
     39TextBox::TextBox(Widget *parent)
    4040{
    4141    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    4646}
    4747
    48 QTextEdit::~QTextEdit()
     48TextBox::~TextBox()
    4949{
    5050    WebCoreTextArea *textArea = (WebCoreTextArea *)getView();
    … …  
    5252}
    5353
    54 void QTextEdit::setText(const String& string)
     54void TextBox::setText(const String& string)
    5555{
    5656    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    6060}
    6161
    62 String QTextEdit::text() const
     62String TextBox::text() const
    6363{
    6464    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    7171}
    7272
    73 String QTextEdit::textWithHardLineBreaks() const
     73String TextBox::textWithHardLineBreaks() const
    7474{
    7575    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    8282}
    8383
    84 void QTextEdit::getCursorPosition(int *paragraph, int *index) const
     84void TextBox::getCursorPosition(int *paragraph, int *index) const
    8585{
    8686    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    9595}
    9696
    97 void QTextEdit::setCursorPosition(int paragraph, int index)
     97void TextBox::setCursorPosition(int paragraph, int index)
    9898{
    9999    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    104104}
    105105
    106 QTextEdit::WrapStyle QTextEdit::wordWrap() const
     106TextBox::WrapStyle TextBox::wordWrap() const
    107107{
    108108    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    115115}
    116116
    117 void QTextEdit::setWordWrap(WrapStyle style)
     117void TextBox::setWordWrap(WrapStyle style)
    118118{
    119119    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    123123}
    124124
    125 void QTextEdit::setScrollBarModes(ScrollBarMode hMode, ScrollBarMode vMode)
     125void TextBox::setScrollBarModes(ScrollBarMode hMode, ScrollBarMode vMode)
    126126{
    127127    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    142142}
    143143
    144 bool QTextEdit::isReadOnly() const
     144bool TextBox::isReadOnly() const
    145145{
    146146    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    153153}
    154154
    155 void QTextEdit::setReadOnly(bool flag)
     155void TextBox::setReadOnly(bool flag)
    156156{
    157157    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    162162}
    163163
    164 bool QTextEdit::isDisabled() const
     164bool TextBox::isDisabled() const
    165165{
    166166    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    173173}
    174174
    175 void QTextEdit::setDisabled(bool flag)
     175void TextBox::setDisabled(bool flag)
    176176{
    177177    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    182182}
    183183
    184 int QTextEdit::selectionStart()
     184int TextBox::selectionStart()
    185185{
    186186    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    196196}
    197197
    198 int QTextEdit::selectionEnd()
     198int TextBox::selectionEnd()
    199199{
    200200    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    210210}
    211211
    212 void QTextEdit::setSelectionStart(int start)
     212void TextBox::setSelectionStart(int start)
    213213{
    214214    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    243243}
    244244
    245 void QTextEdit::setSelectionEnd(int end)
     245void TextBox::setSelectionEnd(int end)
    246246{
    247247    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    275275}
    276276
    277 bool QTextEdit::hasSelectedText() const
     277bool TextBox::hasSelectedText() const
    278278{
    279279    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    286286}
    287287
    288 void QTextEdit::selectAll()
     288void TextBox::selectAll()
    289289{
    290290    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    295295}
    296296
    297 void QTextEdit::setSelectionRange(int start, int length)
     297void TextBox::setSelectionRange(int start, int length)
    298298{
    299299    WebCoreTextArea *textView = (WebCoreTextArea *)getView();
    … …  
    322322}
    323323
    324 void QTextEdit::setFont(const Font& font)
     324void TextBox::setFont(const Font& font)
    325325{
    326326    Widget::setFont(font);
    … …  
    332332}
    333333
    334 void QTextEdit::setAlignment(HorizontalAlignment alignment)
     334void TextBox::setAlignment(HorizontalAlignment alignment)
    335335{
    336336    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    337337
    338338    WebCoreTextArea *textArea = static_cast<WebCoreTextArea *>(getView());
    339     [textArea setAlignment:KWQNSTextAlignment(alignment)];
    340 
    341     END_BLOCK_OBJC_EXCEPTIONS;
    342 }
    343 
    344 void QTextEdit::setLineHeight(int lineHeight)
     339    [textArea setAlignment:TextAlignment(alignment)];
     340
     341    END_BLOCK_OBJC_EXCEPTIONS;
     342}
     343
     344void TextBox::setLineHeight(int lineHeight)
    345345{
    346346    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    352352}
    353353
    354 void QTextEdit::setWritingDirection(TextDirection direction)
     354void TextBox::setWritingDirection(TextDirection direction)
    355355{
    356356    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    362362}
    363363 
    364 IntSize QTextEdit::sizeWithColumnsAndRows(int numColumns, int numRows) const
     364IntSize TextBox::sizeWithColumnsAndRows(int numColumns, int numRows) const
    365365{
    366366    WebCoreTextArea *textArea = static_cast<WebCoreTextArea *>(getView());
    … …  
    374374}
    375375
    376 Widget::FocusPolicy QTextEdit::focusPolicy() const
     376Widget::FocusPolicy TextBox::focusPolicy() const
    377377{
    378378    FocusPolicy policy = ScrollView::focusPolicy();
    … …  
    380380}
    381381
    382 bool QTextEdit::checksDescendantsForFocus() const
     382bool TextBox::checksDescendantsForFocus() const
    383383{
    384384    return true;
    385385}
    386386
    387 void QTextEdit::setColors(const Color& background, const Color& foreground)
     387void TextBox::setColors(const Color& background, const Color& foreground)
    388388{
    389389    WebCoreTextArea *textArea = static_cast<WebCoreTextArea *>(getView());

  • trunk/WebCore/kwq/TextField.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef QLineEdit_H
    27 #define QLineEdit_H
     26#ifndef TextField_h
     27#define TextField_h
    2828
    2929#include "GraphicsTypes.h"
    … …  
    3737
    3838#ifdef __OBJC__
    39 @class KWQTextFieldController;
    40 NSControlSize KWQNSControlSizeForFont(const WebCore::Font&);
     39@class WebCoreTextFieldController;
     40NSControlSize ControlSizeForFont(const WebCore::Font&);
    4141#else
    42 class KWQTextFieldController;
     42class WebCoreTextFieldController;
    4343#endif
    4444
    45 class QLineEdit : public Widget {
     45class TextField : public Widget {
    4646public:
    4747    enum Type { Normal, Password, Search };
    4848
    49     QLineEdit(Type);
    50     ~QLineEdit();
     49    TextField(Type);
     50    ~TextField();
    5151
    5252    void setColors(const WebCore::Color& background, const WebCore::Color& foreground);
    … …  
    9696private:
    9797    Type m_type;
    98     KWQTextFieldController *m_controller;
     98    WebCoreTextFieldController *m_controller;
    9999};
    100100
    101101#ifdef __OBJC__
    102 NSTextAlignment KWQNSTextAlignment(WebCore::HorizontalAlignment);
     102NSTextAlignment TextAlignment(WebCore::HorizontalAlignment);
    103103#endif
    104104

  • trunk/WebCore/kwq/TextField.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQLineEdit.h"
     27#import "TextField.h"
    2828
    2929#import "Color.h"
    … …  
    4444@end
    4545
    46 NSControlSize KWQNSControlSizeForFont(const Font& f)
     46NSControlSize ControlSizeForFont(const Font& f)
    4747{
    4848    const int fontSize = f.pixelSize();
    … …  
    5454}
    5555
    56 QLineEdit::QLineEdit(Type type)
     56TextField::TextField(Type type)
    5757    : m_type(type)
    5858{
    … …  
    6464            break;
    6565        case Password:
    66             view = [KWQSecureTextField alloc];
     66            view = [WebCoreSecureTextField alloc];
    6767            break;
    6868        case Search:
    69             view = [KWQSearchField alloc];
     69            view = [WebCoreSearchField alloc];
    7070            break;
    7171    }
    … …  
    7979}
    8080
    81 QLineEdit::~QLineEdit()
     81TextField::~TextField()
    8282{
    8383    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    8686}
    8787
    88 void QLineEdit::setCursorPosition(int pos)
     88void TextField::setCursorPosition(int pos)
    8989{
    9090    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    9494}
    9595
    96 int QLineEdit::cursorPosition() const
     96int TextField::cursorPosition() const
    9797{
    9898    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    102102}
    103103
    104 void QLineEdit::setFont(const Font &font)
     104void TextField::setFont(const Font &font)
    105105{
    106106    Widget::setFont(font);
    107107    if (m_type == Search) {
    108         const NSControlSize size = KWQNSControlSizeForFont(font);   
     108        const NSControlSize size = ControlSizeForFont(font);   
    109109        NSControl * const searchField = static_cast<NSControl *>(getView());
    110110        [[searchField cell] setControlSize:size];
    … …  
    119119}
    120120
    121 void QLineEdit::setColors(const Color& background, const Color& foreground)
     121void TextField::setColors(const Color& background, const Color& foreground)
    122122{
    123123    NSTextField *textField = (NSTextField *)getView();
    … …  
    140140}
    141141
    142 void QLineEdit::setText(const String& s)
     142void TextField::setText(const String& s)
    143143{
    144144    NSTextField *textField = (NSTextField *)getView();
    … …  
    148148}
    149149
    150 String QLineEdit::text() const
     150String TextField::text() const
    151151{
    152152    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    156156}
    157157
    158 void QLineEdit::setMaxLength(int len)
     158void TextField::setMaxLength(int len)
    159159{
    160160    [m_controller setMaximumLength:len];
    161161}
    162162
    163 bool QLineEdit::isReadOnly() const
     163bool TextField::isReadOnly() const
    164164{
    165165    NSTextField *textField = (NSTextField *)getView();
    … …  
    172172}
    173173
    174 void QLineEdit::setReadOnly(bool flag)
     174void TextField::setReadOnly(bool flag)
    175175{
    176176    NSTextField *textField = (NSTextField *)getView();
    … …  
    180180}
    181181
    182 int QLineEdit::maxLength() const
     182int TextField::maxLength() const
    183183{
    184184    return [m_controller maximumLength];
    … …  
    186186
    187187
    188 void QLineEdit::selectAll()
     188void TextField::selectAll()
    189189{
    190190    if (!hasFocus()) {
    … …  
    200200}
    201201
    202 int QLineEdit::selectionStart() const
     202int TextField::selectionStart() const
    203203{
    204204    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    210210}
    211211
    212 String QLineEdit::selectedText() const
     212String TextField::selectedText() const
    213213{
    214214    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    220220}
    221221
    222 void QLineEdit::setSelection(int start, int length)
     222void TextField::setSelection(int start, int length)
    223223{
    224224    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    228228}
    229229
    230 bool QLineEdit::hasSelectedText() const
     230bool TextField::hasSelectedText() const
    231231{
    232232    return [m_controller hasSelection];
    233233}
    234234
    235 bool QLineEdit::edited() const
     235bool TextField::edited() const
    236236{
    237237    return [m_controller edited];
    238238}
    239239
    240 void QLineEdit::setEdited(bool flag)
     240void TextField::setEdited(bool flag)
    241241{
    242242    [m_controller setEdited:flag];
    … …  
    245245static const NSSize textFieldMargins = { 8, 6 };
    246246
    247 IntSize QLineEdit::sizeForCharacterWidth(int numCharacters) const
     247IntSize TextField::sizeForCharacterWidth(int numCharacters) const
    248248{
    249249    // Figure out how big a text field needs to be for a given number of characters
    … …  
    281281}
    282282
    283 int QLineEdit::baselinePosition(int height) const
     283int TextField::baselinePosition(int height) const
    284284{
    285285    NSTextField *textField = (NSTextField *)getView();
    … …  
    298298}
    299299
    300 void QLineEdit::setAlignment(HorizontalAlignment alignment)
    301 {
    302     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    303 
    304     NSTextField *textField = (NSTextField *)getView();
    305     [textField setAlignment:KWQNSTextAlignment(alignment)];
    306 
    307     END_BLOCK_OBJC_EXCEPTIONS;
    308 }
    309 
    310 void QLineEdit::setWritingDirection(TextDirection direction)
     300void TextField::setAlignment(HorizontalAlignment alignment)
     301{
     302    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     303
     304    NSTextField *textField = (NSTextField *)getView();
     305    [textField setAlignment:TextAlignment(alignment)];
     306
     307    END_BLOCK_OBJC_EXCEPTIONS;
     308}
     309
     310void TextField::setWritingDirection(TextDirection direction)
    311311{
    312312    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    315315}
    316316
    317 Widget::FocusPolicy QLineEdit::focusPolicy() const
     317Widget::FocusPolicy TextField::focusPolicy() const
    318318{
    319319    FocusPolicy policy = Widget::focusPolicy();
    … …  
    321321}
    322322
    323 bool QLineEdit::checksDescendantsForFocus() const
     323bool TextField::checksDescendantsForFocus() const
    324324{
    325325    return true;
    326326}
    327327
    328 NSTextAlignment KWQNSTextAlignment(HorizontalAlignment a)
     328NSTextAlignment TextAlignment(HorizontalAlignment a)
    329329{
    330330    switch (a) {
    … …  
    340340}
    341341
    342 void QLineEdit::setLiveSearch(bool liveSearch)
     342void TextField::setLiveSearch(bool liveSearch)
    343343{
    344344    if (m_type != Search)
    … …  
    349349}
    350350
    351 void QLineEdit::setAutoSaveName(const String& name)
     351void TextField::setAutoSaveName(const String& name)
    352352{
    353353    if (m_type != Search)
    … …  
    362362}
    363363
    364 void QLineEdit::setMaxResults(int maxResults)
     364void TextField::setMaxResults(int maxResults)
    365365{
    366366    if (m_type != Search)
    … …  
    387387}
    388388
    389 void QLineEdit::setPlaceholderString(const WebCore::String& placeholder)
     389void TextField::setPlaceholderString(const WebCore::String& placeholder)
    390390{
    391391    NSTextField *textField = (NSTextField *)getView();
    … …  
    393393}
    394394
    395 void QLineEdit::addSearchResult()
     395void TextField::addSearchResult()
    396396{
    397397    if (m_type != Search)

  • trunk/WebCore/kwq/TextStream.cpp

    r15251 r15253  
    2525
    2626#include "config.h"
    27 #include "KWQTextStream.h"
     27#include "TextStream.h"
    2828
    2929#include "DeprecatedString.h"
    … …  
    3737const int defaultPrecision = 6; // matches qt and sprintf(.., "%f", ...) behaviour
    3838
    39 QTextStream::QTextStream(DeprecatedString* s)
     39TextStream::TextStream(DeprecatedString* s)
    4040    : m_hasByteArray(false), m_string(s), m_precision(defaultPrecision)
    4141{
    4242}
    4343
    44 QTextStream& QTextStream::operator<<(char c)
     44TextStream& TextStream::operator<<(char c)
    4545{
    4646    if (m_hasByteArray)
    … …  
    4848
    4949    if (m_string)
    50         m_string->append(QChar(c));
     50        m_string->append(DeprecatedChar(c));
    5151    return *this;
    5252}
    5353
    54 QTextStream& QTextStream::operator<<(short i)
     54TextStream& TextStream::operator<<(short i)
    5555{
    5656    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    5959}
    6060
    61 QTextStream& QTextStream::operator<<(unsigned short i)
     61TextStream& TextStream::operator<<(unsigned short i)
    6262{
    6363    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    6666}
    6767
    68 QTextStream& QTextStream::operator<<(int i)
     68TextStream& TextStream::operator<<(int i)
    6969{
    7070    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    7373}
    7474
    75 QTextStream& QTextStream::operator<<(unsigned i)
     75TextStream& TextStream::operator<<(unsigned i)
    7676{
    7777    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    8080}
    8181
    82 QTextStream& QTextStream::operator<<(long i)
     82TextStream& TextStream::operator<<(long i)
    8383{
    8484    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    8787}
    8888
    89 QTextStream& QTextStream::operator<<(unsigned long i)
     89TextStream& TextStream::operator<<(unsigned long i)
    9090{
    9191    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    9494}
    9595
    96 QTextStream& QTextStream::operator<<(float f)
     96TextStream& TextStream::operator<<(float f)
    9797{
    9898    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    101101}
    102102
    103 QTextStream& QTextStream::operator<<(double d)
     103TextStream& TextStream::operator<<(double d)
    104104{
    105105    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    108108}
    109109
    110 QTextStream& QTextStream::operator<<(const char* s)
     110TextStream& TextStream::operator<<(const char* s)
    111111{
    112112    if (m_hasByteArray) {
    … …  
    121121}
    122122
    123 QTextStream& QTextStream::operator<<(const DeprecatedCString& qcs)
     123TextStream& TextStream::operator<<(const DeprecatedCString& qcs)
    124124{
    125125    const char *s = qcs;
    … …  
    127127}
    128128
    129 QTextStream& QTextStream::operator<<(const DeprecatedString& s)
     129TextStream& TextStream::operator<<(const DeprecatedString& s)
    130130{
    131131    if (m_hasByteArray) {
    … …  
    140140}
    141141
    142 QTextStream& QTextStream::operator<<(const WebCore::String& s)
     142TextStream& TextStream::operator<<(const WebCore::String& s)
    143143{
    144144    return (*this) << s.deprecatedString();
    145145}
    146146
    147 QTextStream& QTextStream::operator<<(void* p)
     147TextStream& TextStream::operator<<(void* p)
    148148{
    149149    char buffer[integerOrPointerAsStringBufferSize];
    … …  
    152152}
    153153
    154 QTextStream& QTextStream::operator<<(const QTextStreamManipulator& m)
     154TextStream& TextStream::operator<<(const TextStreamManipulator& m)
    155155{
    156156    return m(*this);
    157157}
    158158
    159 int QTextStream::precision(int p)
     159int TextStream::precision(int p)
    160160{
    161161    int oldPrecision = m_precision;
    … …  
    167167}
    168168
    169 QTextStream &endl(QTextStream& stream)
     169TextStream &endl(TextStream& stream)
    170170{
    171171    return stream << '\n';

  • trunk/WebCore/kwq/TextStream.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef QTextStream_H
    27 #define QTextStream_H
     26#ifndef TextStream_h
     27#define TextStream_h
    2828
    2929#include <wtf/Vector.h>
    … …  
    3131class DeprecatedCString;
    3232class DeprecatedString;
    33 class QChar;
    34 class QTextStream;
     33class DeprecatedChar;
     34class TextStream;
    3535
    3636namespace WebCore {
    … …  
    3838}
    3939
    40 typedef QTextStream &(*QTextStreamManipulator)(QTextStream&);
     40typedef TextStream &(*TextStreamManipulator)(TextStream&);
    4141
    42 QTextStream &endl(QTextStream& stream);
     42TextStream &endl(TextStream& stream);
    4343
    44 class QTextStream {
     44class TextStream {
    4545public:
    46     QTextStream(DeprecatedString*);
     46    TextStream(DeprecatedString*);
    4747
    48     QTextStream& operator<<(char);
    49     QTextStream& operator<<(const QChar&);
    50     QTextStream& operator<<(short);
    51     QTextStream& operator<<(unsigned short);
    52     QTextStream& operator<<(int);
    53     QTextStream& operator<<(unsigned);
    54     QTextStream& operator<<(long);
    55     QTextStream& operator<<(unsigned long);
    56     QTextStream& operator<<(float);
    57     QTextStream& operator<<(double);
    58     QTextStream& operator<<(const char*);
    59     QTextStream& operator<<(const WebCore::String&);
    60     QTextStream& operator<<(const DeprecatedString&);
    61     QTextStream& operator<<(const DeprecatedCString&);
    62     QTextStream& operator<<(void*);
     48    TextStream& operator<<(char);
     49    TextStream& operator<<(const DeprecatedChar&);
     50    TextStream& operator<<(short);
     51    TextStream& operator<<(unsigned short);
     52    TextStream& operator<<(int);
     53    TextStream& operator<<(unsigned);
     54    TextStream& operator<<(long);
     55    TextStream& operator<<(unsigned long);
     56    TextStream& operator<<(float);
     57    TextStream& operator<<(double);
     58    TextStream& operator<<(const char*);
     59    TextStream& operator<<(const WebCore::String&);
     60    TextStream& operator<<(const DeprecatedString&);
     61    TextStream& operator<<(const DeprecatedCString&);
     62    TextStream& operator<<(void*);
    6363
    64     QTextStream& operator<<(const QTextStreamManipulator&);
     64    TextStream& operator<<(const TextStreamManipulator&);
    6565    int precision(int);
    6666private:
    67     QTextStream(const QTextStream&);
    68     QTextStream& operator=(const QTextStream&);
     67    TextStream(const TextStream&);
     68    TextStream& operator=(const TextStream&);
    6969
    7070    bool m_hasByteArray;

  • trunk/WebCore/kwq/WebCoreEditCommand.h

    r15251 r15253  
    2828}
    2929
    30 @interface KWQEditCommand : NSObject
     30@interface WebCoreEditCommand : NSObject
    3131{
    3232    WebCore::EditCommand *m_command;   
    3333}
    3434
    35 + (KWQEditCommand *)commandWithEditCommand:(WebCore::EditCommand *)command;
     35+ (WebCoreEditCommand *)commandWithEditCommand:(WebCore::EditCommand *)command;
    3636- (WebCore::EditCommand *)command;
    3737

  • trunk/WebCore/kwq/WebCoreEditCommand.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQEditCommand.h"
     27#import "WebCoreEditCommand.h"
    2828
    2929#import "EditCommand.h"
    … …  
    3131using namespace WebCore;
    3232
    33 @implementation KWQEditCommand
     33@implementation WebCoreEditCommand
    3434
    3535- (id)initWithEditCommand:(EditCommand *)command
    … …  
    5454}
    5555
    56 + (KWQEditCommand *)commandWithEditCommand:(EditCommand *)command
     56+ (WebCoreEditCommand *)commandWithEditCommand:(EditCommand *)command
    5757{
    58     return [[[KWQEditCommand alloc] initWithEditCommand:command] autorelease];
     58    return [[[WebCoreEditCommand alloc] initWithEditCommand:command] autorelease];
    5959}
    6060

  • trunk/WebCore/kwq/WebCorePageState.h

    r15251 r15253  
    3939class KURL;
    4040
    41 @interface KWQPageState : NSObject
     41@interface WebCorePageState : NSObject
    4242{
    4343    WebCore::Document *document;

  • trunk/WebCore/kwq/WebCorePageState.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQPageState.h"
     27#import "WebCorePageState.h"
    2828
    2929#import "Document.h"
    … …  
    3636using namespace KJS;
    3737
    38 @implementation KWQPageState
     38@implementation WebCorePageState
    3939
    4040- (id)initWithDocument:(Document *)doc URL:(const KURL &)u windowProperties:(SavedProperties *)wp locationProperties:(SavedProperties *)lp interpreterBuiltins:(SavedBuiltins *)ib pausedTimeouts:(PausedTimeouts *)pt

  • trunk/WebCore/kwq/WebCoreResourceLoaderImp.h

    r15251 r15253  
    3030}
    3131
    32 @interface KWQResourceLoader : NSObject <WebCoreResourceLoader>
     32@interface WebCoreResourceLoaderImp : NSObject <WebCoreResourceLoader>
    3333{
    3434    WebCore::TransferJob* _job;

  • trunk/WebCore/kwq/WebCoreResourceLoaderImp.mm

    r15251 r15253  
    2525
    2626#include "config.h"
    27 #import "KWQResourceLoader.h"
     27#import "WebCoreResourceLoaderImp.h"
    2828
    2929#import "TransferJob.h"
    … …  
    3434using namespace WebCore;
    3535
    36 @implementation KWQResourceLoader
     36@implementation WebCoreResourceLoaderImp
    3737
    3838- (id)initWithJob:(TransferJob *)job;

  • trunk/WebCore/kwq/WebCoreScrollBar.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef KWQSCROLLBAR_H_
    27 #define KWQSCROLLBAR_H_
     26#ifndef ScrollBar_h
     27#define ScrollBar_h
    2828
    2929#include "Widget.h"
    … …  
    3737
    3838typedef enum {
    39     KWQScrollUp,
    40     KWQScrollDown,
    41     KWQScrollLeft,
    42     KWQScrollRight
    43 } KWQScrollDirection;
     39    ScrollUp,
     40    ScrollDown,
     41    ScrollLeft,
     42    ScrollRight
     43} ScrollDirection;
    4444
    4545typedef enum {
    46     KWQScrollLine,
    47     KWQScrollPage,
    48     KWQScrollDocument,
    49     KWQScrollWheel
    50 } KWQScrollGranularity;
     46    ScrollByLine,
     47    ScrollByPage,
     48    ScrollByDocument,
     49    ScrollByWheel
     50} ScrollGranularity;
    5151
    5252namespace WebCore {
    … …  
    5454}
    5555
    56 class QScrollBar : public Widget {
     56class ScrollBar : public Widget {
    5757public:
    58     QScrollBar(WebCore::ScrollBarOrientation);
    59     virtual ~QScrollBar();
     58    ScrollBar(WebCore::ScrollBarOrientation);
     59    virtual ~ScrollBar();
    6060
    6161    WebCore::ScrollBarOrientation orientation() { return m_orientation; }
    … …  
    7070    void valueChanged();
    7171   
    72     bool scroll(KWQScrollDirection, KWQScrollGranularity, float multiplier = 1.0);
     72    bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1.0);
    7373   
    7474private:

  • trunk/WebCore/kwq/WebCoreScrollBar.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQScrollBar.h"
     27#import "WebCoreScrollBar.h"
    2828
    2929#import "BlockExceptions.h"
    … …  
    3333using namespace WebCore;
    3434
    35 @interface KWQScrollBar : NSScroller <WebCoreWidgetHolder>
    36 {
    37     QScrollBar* scrollBar;
    38 }
    39 
    40 - (id)initWithQScrollBar:(QScrollBar *)s;
     35@interface WebCoreScrollBar : NSScroller <WebCoreWidgetHolder>
     36{
     37    ScrollBar* scrollBar;
     38}
     39
     40- (id)initWithQScrollBar:(ScrollBar *)s;
    4141- (void)detachQScrollBar;
    4242
    4343@end
    4444
    45 @implementation KWQScrollBar
    46 
    47 - (id)initWithQScrollBar:(QScrollBar *)s
     45@implementation WebCoreScrollBar
     46
     47- (id)initWithQScrollBar:(ScrollBar *)s
    4848{
    4949    // Cocoa scrollbars just set their orientation by examining their own
    … …  
    9696@end
    9797
    98 QScrollBar::QScrollBar(ScrollBarOrientation orientation)
     98ScrollBar::ScrollBar(ScrollBarOrientation orientation)
    9999    : m_orientation(orientation)
    100100    , m_visibleSize(0)
    … …  
    106106    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    107107
    108     KWQScrollBar *bar = [[KWQScrollBar alloc] initWithQScrollBar:this];
     108    WebCoreScrollBar *bar = [[WebCoreScrollBar alloc] initWithQScrollBar:this];
    109109    setView(bar);
    110110    [bar release];
    … …  
    113113}
    114114
    115 QScrollBar::~QScrollBar()
    116 {
    117     KWQScrollBar *bar = (KWQScrollBar *)getView();
     115ScrollBar::~ScrollBar()
     116{
     117    WebCoreScrollBar *bar = (WebCoreScrollBar *)getView();
    118118    [bar detachQScrollBar];
    119119
    … …  
    121121    // But we don't need it for form elements, and for frames it doesn't work
    122122    // well because of the way the NSViews are created in WebKit. So for now,
    123     // we'll just do it explictly for QScrollBar.
     123    // we'll just do it explictly for ScrollBar.
    124124    [bar removeFromSuperview];
    125125}
    126126
    127 bool QScrollBar::setValue(int v)
     127bool ScrollBar::setValue(int v)
    128128{
    129129    int maxPos = m_totalSize - m_visibleSize;
    … …  
    136136
    137137    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    138     KWQScrollBar *bar = (KWQScrollBar *)getView();
     138    WebCoreScrollBar *bar = (WebCoreScrollBar *)getView();
    139139    [bar setFloatValue:(float)m_currentPos/maxPos
    140140        knobProportion:[bar knobProportion]];
    … …  
    146146}
    147147
    148 void QScrollBar::setSteps(int lineStep, int pageStep)
     148void ScrollBar::setSteps(int lineStep, int pageStep)
    149149{
    150150    m_lineStep = lineStep;
    … …  
    152152}
    153153
    154 void QScrollBar::setKnobProportion(int visibleArea, int totalArea)
     154void ScrollBar::setKnobProportion(int visibleArea, int totalArea)
    155155{
    156156    m_visibleSize = visibleArea;
    … …  
    159159
    160160    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    161     KWQScrollBar *bar = (KWQScrollBar *)getView();
     161    WebCoreScrollBar *bar = (WebCoreScrollBar *)getView();
    162162    if (!(val == [bar knobProportion] || val < 0.0))
    163163        [bar setFloatValue: [bar floatValue] knobProportion: val];
    … …  
    165165}
    166166
    167 bool QScrollBar::scrollbarHit(NSScrollerPart hitPart)
     167bool ScrollBar::scrollbarHit(NSScrollerPart hitPart)
    168168{
    169169    int maxPos = m_totalSize - m_visibleSize;
    … …  
    171171        return false; // Impossible to scroll anywhere.
    172172   
    173     KWQScrollBar *bar = (KWQScrollBar *)getView();
     173    WebCoreScrollBar *bar = (WebCoreScrollBar *)getView();
    174174    int newPos = m_currentPos;
    175175    switch (hitPart) {
    … …  
    200200}
    201201
    202 void QScrollBar::valueChanged()
     202void ScrollBar::valueChanged()
    203203{
    204204    if (client())
    … …  
    206206}
    207207
    208 bool QScrollBar::scroll(KWQScrollDirection direction, KWQScrollGranularity granularity, float multiplier)
     208bool ScrollBar::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier)
    209209{
    210210    float delta = 0.0;
    211     if ((direction == KWQScrollUp && m_orientation == VerticalScrollBar) || (direction == KWQScrollLeft && m_orientation == HorizontalScrollBar)) {
    212         if (granularity == KWQScrollLine) {
     211    if ((direction == ScrollUp && m_orientation == VerticalScrollBar) || (direction == ScrollLeft && m_orientation == HorizontalScrollBar)) {
     212        if (granularity == ScrollByLine) {
    213213            delta = -m_lineStep;
    214         } else if (granularity == KWQScrollPage) {
     214        } else if (granularity == ScrollByPage) {
    215215            delta = -m_pageStep;
    216         } else if (granularity == KWQScrollDocument) {
     216        } else if (granularity == ScrollByDocument) {
    217217            delta = -m_currentPos;
    218         } else if (granularity == KWQScrollWheel) {
     218        } else if (granularity == ScrollByWheel) {
    219219            delta = -m_lineStep;
    220220        }
    221     } else if ((direction == KWQScrollDown && m_orientation == VerticalScrollBar) || (direction == KWQScrollRight && m_orientation == HorizontalScrollBar)) {
    222         if (granularity == KWQScrollLine) {
     221    } else if ((direction == ScrollDown && m_orientation == VerticalScrollBar) || (direction == ScrollRight && m_orientation == HorizontalScrollBar)) {
     222        if (granularity == ScrollByLine) {
    223223            delta = m_lineStep;
    224         } else if (granularity == KWQScrollPage) {
     224        } else if (granularity == ScrollByPage) {
    225225            delta = m_pageStep;
    226         } else if (granularity == KWQScrollDocument) {
     226        } else if (granularity == ScrollByDocument) {
    227227            delta = m_totalSize - m_visibleSize - m_currentPos;
    228         } else if (granularity == KWQScrollWheel) {
     228        } else if (granularity == ScrollByWheel) {
    229229            delta = m_lineStep;
    230230        }

  • trunk/WebCore/kwq/WebCoreSlider.h

    r15251 r15253  
    2424 */
    2525
    26 #ifndef KWQSLIDER_H_
    27 #define KWQSLIDER_H_
     26#ifndef WebCoreSlider_h
     27#define WebCoreSlider_h
    2828
    2929#include "Widget.h"
    3030
    31 class QSlider : public Widget {
     31class Slider : public Widget {
    3232public:
    33     QSlider();
    34     ~QSlider();
     33    Slider();
     34    ~Slider();
    3535
    3636    IntSize sizeHint() const;

  • trunk/WebCore/kwq/WebCoreSlider.mm

    r15251 r15253  
    2525
    2626#import "config.h"
    27 #import "KWQSlider.h"
     27#import "WebCoreSlider.h"
    2828
    2929#import "BlockExceptions.h"
    30 #import "KWQLineEdit.h"
     30#import "TextField.h"
    3131#import "FrameMac.h"
    3232#import "WebCoreFrameBridge.h"
    … …  
    3737using namespace WebCore;
    3838
    39 @interface KWQSlider : NSSlider <WebCoreWidgetHolder>
    40 {
    41     QSlider* slider;
     39@interface WebCoreSlider : NSSlider <WebCoreWidgetHolder>
     40{
     41    Slider* slider;
    4242    BOOL inNextValidKeyView;
    4343}
    4444
    45 - (id)initWithQSlider:(QSlider*)s;
    46 - (void)detachQSlider;
     45- (id)initWithSlider:(Slider*)s;
     46- (void)detachSlider;
    4747
    4848@end
    4949
    50 @implementation KWQSlider
    51 
    52 - (id)initWithQSlider:(QSlider*)s
     50@implementation WebCoreSlider
     51
     52- (id)initWithSlider:(Slider*)s
    5353{
    5454    self = [self init];
    … …  
    6666}
    6767
    68 - (void)detachQSlider
     68- (void)detachSlider
    6969{
    7070    [self setTarget:nil];
    … …  
    128128        [self resignFirstResponder];
    129129        if (slider) {
    130             view = FrameMac::nextKeyViewForWidget(slider, KWQSelectingNext);
     130            view = FrameMac::nextKeyViewForWidget(slider, SelectingNext);
    131131        } else {
    132132            view = [super nextKeyView];
    … …  
    148148        [self resignFirstResponder];
    149149        if (slider) {
    150             view = FrameMac::nextKeyViewForWidget(slider, KWQSelectingPrevious);
     150            view = FrameMac::nextKeyViewForWidget(slider, SelectingPrevious);
    151151        } else {
    152152            view = [super previousKeyView];
    … …  
    191191};
    192192
    193 QSlider::QSlider()
     193Slider::Slider()
    194194    : m_minVal(0.0), m_maxVal(100.0), m_val(50.0)
    195195{
    196196    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    197     KWQSlider* slider = [[KWQSlider alloc] initWithQSlider:this];
     197    WebCoreSlider* slider = [[WebCoreSlider alloc] initWithSlider:this];
    198198    [[slider cell] setControlSize:NSSmallControlSize];
    199199    setView(slider);
    … …  
    202202}
    203203
    204 QSlider::~QSlider()
    205 {
    206     KWQSlider* slider = (KWQSlider*)getView();
    207     [slider detachQSlider];
    208 }
    209 
    210 void QSlider::setFont(const Font& f)
     204Slider::~Slider()
     205{
     206    WebCoreSlider* slider = (WebCoreSlider*)getView();
     207    [slider detachSlider];
     208}
     209
     210void Slider::setFont(const Font& f)
    211211{
    212212    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    214214    Widget::setFont(f);
    215215   
    216     const NSControlSize size = KWQNSControlSizeForFont(f);   
     216    const NSControlSize size = ControlSizeForFont(f);   
    217217    NSControl * const slider = static_cast<NSControl *>(getView());
    218218    [[slider cell] setControlSize:size];
    … …  
    222222}
    223223
    224 Widget::FocusPolicy QSlider::focusPolicy() const
     224Widget::FocusPolicy Slider::focusPolicy() const
    225225{
    226226    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    236236}
    237237
    238 IntSize QSlider::sizeHint() const
     238IntSize Slider::sizeHint() const
    239239{
    240240    return IntSize(dimensions()[dimWidth], dimensions()[dimHeight]);
    241241}
    242242
    243 void QSlider::setValue(double v)
     243void Slider::setValue(double v)
    244244{
    245245    double val = max(m_minVal, min(v, m_maxVal));
    246246   
    247     KWQSlider* slider = (KWQSlider*)getView();
     247    WebCoreSlider* slider = (WebCoreSlider*)getView();
    248248    [slider setDoubleValue: val];
    249249    m_val = val;
    250250}
    251251
    252 void QSlider::setMinValue(double v)
     252void Slider::setMinValue(double v)
    253253{
    254254    if (v == m_minVal) return;
    255255
    256     KWQSlider* slider = (KWQSlider*)getView();
     256    WebCoreSlider* slider = (WebCoreSlider*)getView();
    257257    [slider setMinValue: v];
    258258    m_minVal = v;
    259259}
    260260
    261 void QSlider::setMaxValue(double v)
     261void Slider::setMaxValue(double v)
    262262{
    263263    if (v == m_maxVal) return;
    264264
    265     KWQSlider* slider = (KWQSlider*)getView();
     265    WebCoreSlider* slider = (WebCoreSlider*)getView();
    266266    [slider setMaxValue: v];
    267267    m_maxVal = v;
    268268}
    269269
    270 double QSlider::value() const
     270double Slider::value() const
    271271{
    272272    return m_val;
    273273}
    274274
    275 double QSlider::minValue() const
     275double Slider::minValue() const
    276276{
    277277    return m_minVal;
    278278}
    279279
    280 double QSlider::maxValue() const
     280double Slider::maxValue() const
    281281{
    282282    return m_maxVal;
    283283}
    284284
    285 void QSlider::sliderValueChanged()
    286 {
    287     KWQSlider* slider = (KWQSlider*)getView();
     285void Slider::sliderValueChanged()
     286{
     287    WebCoreSlider* slider = (WebCoreSlider*)getView();
    288288    double v = [slider doubleValue];
    289289    if (m_val != v) {
    … …  
    294294}
    295295
    296 const int* QSlider::dimensions() const
     296const int* Slider::dimensions() const
    297297{
    298298    // We empirically determined these dimensions.

  • trunk/WebCore/loader/Cache.h

    r14732 r15253  
    2929
    3030#include "PlatformString.h"
    31 #include "KWQKIOGlobal.h"
     31#include "CacheControl.h"
    3232#include "DeprecatedPtrList.h"
    3333#include <wtf/HashSet.h>

  • trunk/WebCore/loader/CachedCSSStyleSheet.cpp

    r14816 r15253  
    3333#include "CachedObjectClient.h"
    3434#include "CachedObjectClientWalker.h"
    35 #include "KWQLoader.h"
     35#include "LoaderFunctions.h"
    3636#include "loader.h"
    3737#include <wtf/Vector.h>
    … …  
    109109    while (CachedObjectClient *c = w.next()) {
    110110#if __APPLE__
    111         if (m_response && !KWQIsResponseURLEqualToURL(m_response, m_url))
    112             c->setStyleSheet(String(KWQResponseURL(m_response)), m_sheet);
     111        if (m_response && !IsResponseURLEqualToURL(m_response, m_url))
     112            c->setStyleSheet(String(ResponseURL(m_response)), m_sheet);
    113113        else
    114114#endif

  • trunk/WebCore/loader/CachedImage.cpp

    r14816 r15253  
    3535#include "DocLoader.h"
    3636#include "Image.h"
    37 #include "KWQLoader.h"
     37#include "LoaderFunctions.h"
    3838#include "Request.h"
    3939#include <wtf/Vector.h>
    … …  
    117117    if (!m_image)
    118118#if __APPLE__
    119         m_image = new Image(this, KWQResponseMIMEType(m_response) == "application/pdf");
     119        m_image = new Image(this, ResponseMIMEType(m_response) == "application/pdf");
    120120#else
    121121        m_image = new Image(this, false);

  • trunk/WebCore/loader/CachedObject.h

    r14816 r15253  
    2626*/
    2727
    28 #ifndef KHTML_CachedObject_h
    29 #define KHTML_CachedObject_h
     28#ifndef CachedObject_h
     29#define CachedObject_h
    3030
    3131#include "DeprecatedString.h"
    3232#include "PlatformString.h"
    33 #include "KWQKIOGlobal.h"
     33#include "CacheControl.h"
    3434#include <wtf/HashSet.h>
    3535#include <wtf/Vector.h>

  • trunk/WebCore/loader/CachedObjectClientWalker.h

    r14271 r15253  
    2525*/
    2626
    27 #ifndef KHTML_CachedObjectClientWalker_h
    28 #define KHTML_CachedObjectClientWalker_h
     27#ifndef CachedObjectClientWalker_h
     28#define CachedObjectClientWalker_h
    2929
    3030#include <wtf/HashSet.h>

  • trunk/WebCore/loader/CachedResource.h

    r14818 r15253  
    2525*/
    2626
    27 #ifndef KHTML_CachedObject_h
    28 #define KHTML_CachedObject_h
     27#ifndef CachedObject_h
     28#define CachedObject_h
    2929
    3030#include "PlatformString.h"
    31 #include "KWQKIOGlobal.h"
     31#include "CacheControl.h"
    3232#include <wtf/HashSet.h>
    3333#include <time.h>

  • trunk/WebCore/loader/CachedResourceClientWalker.h

    r14264 r15253  
    2525*/
    2626
    27 #ifndef KHTML_CachedObjectClientWalker_h
    28 #define KHTML_CachedObjectClientWalker_h
     27#ifndef CachedObjectClientWalker_h
     28#define CachedObjectClientWalker_h
    2929
    3030#include <wtf/HashSet.h>

  • trunk/WebCore/loader/CachedScript.h

    r14816 r15253  
    2626*/
    2727
    28 #ifndef KHTML_CachedScript_h
    29 #define KHTML_CachedScript_h
     28#ifndef CachedScript_h
     29#define CachedScript_h
    3030
    3131#include "CachedObject.h"

  • trunk/WebCore/loader/CachedXBLDocument.h

    r14816 r15253  
    2626*/
    2727
    28 #ifndef KHTML_CachedXBLDocument_h
    29 #define KHTML_CachedXBLDocument_h
     28#ifndef CachedXBLDocument_h
     29#define CachedXBLDocument_h
    3030
    3131#include "CachedObject.h"

  • trunk/WebCore/loader/Decoder.h

    r14256 r15253  
    2020
    2121*/
    22 #ifndef KHTMLDECODER_H
    23 #define KHTMLDECODER_H
     22#ifndef Decoder_h
     23#define Decoder_h
    2424
    2525#include <wtf/OwnPtr.h>

  • trunk/WebCore/loader/DocLoader.cpp

    r14251 r15253  
    3636#include "Document.h"
    3737#include "Frame.h"
    38 #include "KWQLoader.h"
     38#include "LoaderFunctions.h"
    3939#include "loader.h"
    4040
    … …  
    9292    KURL fullURL = m_doc->completeURL(url.deprecatedString());
    9393
    94     if (KWQCheckIfReloading(this))
     94    if (CheckIfReloading(this))
    9595        setCachePolicy(KIO::CC_Reload);
    9696
    … …  
    9898
    9999    CachedImage *cachedObject = Cache::requestImage(this, fullURL, reload, m_expireDate);
    100     KWQCheckCacheObjectStatus(this, cachedObject);
     100    CheckCacheObjectStatus(this, cachedObject);
    101101    return cachedObject;
    102102}
    … …  
    106106    KURL fullURL = m_doc->completeURL(url.deprecatedString());
    107107
    108     if (KWQCheckIfReloading(this))
     108    if (CheckIfReloading(this))
    109109        setCachePolicy(KIO::CC_Reload);
    110110
    … …  
    112112
    113113    CachedCSSStyleSheet *cachedObject = Cache::requestStyleSheet(this, url, reload, m_expireDate, charset);
    114     KWQCheckCacheObjectStatus(this, cachedObject);
     114    CheckCacheObjectStatus(this, cachedObject);
    115115    return cachedObject;
    116116}
    … …  
    120120    KURL fullURL = m_doc->completeURL(url.deprecatedString());
    121121
    122     if (KWQCheckIfReloading(this))
     122    if (CheckIfReloading(this))
    123123        setCachePolicy(KIO::CC_Reload);
    124124
    … …  
    126126
    127127    CachedScript *cachedObject = Cache::requestScript(this, url, reload, m_expireDate, charset);
    128     KWQCheckCacheObjectStatus(this, cachedObject);
     128    CheckCacheObjectStatus(this, cachedObject);
    129129    return cachedObject;
    130130}
    … …  
    135135    KURL fullURL = m_doc->completeURL(url.deprecatedString());
    136136   
    137     if (KWQCheckIfReloading(this))
     137    if (CheckIfReloading(this))
    138138        setCachePolicy(KIO::CC_Reload);
    139139   
    … …  
    141141   
    142142    CachedXSLStyleSheet *cachedObject = Cache::requestXSLStyleSheet(this, url, reload, m_expireDate);
    143     KWQCheckCacheObjectStatus(this, cachedObject);
     143    CheckCacheObjectStatus(this, cachedObject);
    144144    return cachedObject;
    145145}
    … …  
    154154    if (m_frame && m_frame->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
    155155   
    156     if (KWQCheckIfReloading(this))
     156    if (CheckIfReloading(this))
    157157        setCachePolicy(KIO::CC_Reload);
    158158   
    … …  
    160160   
    161161    CachedXBLDocument *cachedObject = Cache::requestXBLDocument(this, url, reload, m_expireDate);
    162     KWQCheckCacheObjectStatus(this, cachedObject);
     162    CheckCacheObjectStatus(this, cachedObject);
    163163    return cachedObject;
    164164}

  • trunk/WebCore/loader/DocLoader.h

    r14414 r15253  
    2525*/
    2626
    27 #ifndef KHTML_DocLoader_h
    28 #define KHTML_DocLoader_h
     27#ifndef DocLoader_h
     28#define DocLoader_h
    2929
    30 #include "KWQKHTMLSettings.h"
    31 #include "KWQKIOGlobal.h"
     30#include "Settings.h"
     31#include "CacheControl.h"
    3232#include "DeprecatedPtrList.h"
    3333#include "DeprecatedStringList.h"
    … …  
    3636
    3737class KURL;
    38 class KWQLoader;
     38class LoaderFunctions;
    3939
    4040namespace WebCore {

  • trunk/WebCore/loader/FormData.h

    r14816 r15253  
    1919 */
    2020
    21 #ifndef KHTML_FORM_DATA_H
    22 #define KHTML_FORM_DATA_H
     21#ifndef FormData_h
     22#define FormData_h
    2323
    2424#include "DeprecatedString.h"

  • trunk/WebCore/loader/ImageDocument.cpp

    r15154 r15253  
    3232#include "SegmentedString.h"
    3333#include "Text.h"
    34 #include "xml_tokenizer.h"
     34#include "XMLTokenizer.h"
    3535
    3636#if PLATFORM(MAC)

  • trunk/WebCore/loader/PluginDocument.cpp

    r14838 r15253  
    3434#include "Text.h"
    3535#include "HTMLEmbedElement.h"
    36 #include "xml_tokenizer.h"
     36#include "XMLTokenizer.h"
    3737
    3838namespace WebCore {

  • trunk/WebCore/loader/TextDocument.cpp

    r14924 r15253  
    3131#include "SegmentedString.h"
    3232#include "Text.h"
    33 #include "xml_tokenizer.h"
     33#include "XMLTokenizer.h"
    3434
    3535using namespace std;

  • trunk/WebCore/loader/loader.cpp

    r14816 r15253  
    3636#include "Frame.h"
    3737#include "HTMLDocument.h"
    38 #include "KWQLoader.h"
     38#include "LoaderFunctions.h"
    3939#include "Request.h"
    4040#include "TransferJob.h"
    … …  
    155155    ASSERT(response);
    156156    req->cachedObject()->setResponse(response);
    157     req->cachedObject()->setExpireDate(KWQCacheObjectExpiresTime(req->docLoader(), response), false);
     157    req->cachedObject()->setExpireDate(CacheObjectExpiresTime(req->docLoader(), response), false);
    158158   
    159159    DeprecatedString chs = job->queryMetaData("charset").deprecatedString();
    … …  
    166166        if (req->docLoader()->frame())
    167167            req->docLoader()->frame()->checkCompleted();
    168     } else if (KWQResponseIsMultipart(response)) {
     168    } else if (ResponseIsMultipart(response)) {
    169169        req->setIsMultipart(true);
    170170        if (!req->cachedObject()->isImage())

  • trunk/WebCore/loader/loader.h

    r14256 r15253  
    2525*/
    2626
    27 #ifndef KHTML_Loader_h
    28 #define KHTML_Loader_h
     27#ifndef loader_h
     28#define loader_h
    2929
    3030#include "TransferJobClient.h"

  • trunk/WebCore/page/Frame.cpp

    r15240 r15253  
    6363#include "RenderPart.h"
    6464#include "RenderTheme.h"
    65 #include "RenderTextField.h"
     65#include "RenderTextControl.h"
    6666#include "RenderView.h"
    6767#include "SegmentedString.h"
    … …  
    7474#include "markup.h"
    7575#include "visible_units.h"
    76 #include "xml_tokenizer.h"
     76#include "XMLTokenizer.h"
    7777#include "xmlhttprequest.h"
    7878#include <math.h>
    … …  
    823823}
    824824
    825 const KHTMLSettings *Frame::settings() const
     825const Settings *Frame::settings() const
    826826{
    827827  return d->m_settings;
    … …  
    12031203    // If the current selection is in a textfield or textarea, notify the renderer that the selection has changed
    12041204    if (renderer && (renderer->isTextArea() || renderer->isTextField()))
    1205         static_cast<RenderTextField*>(renderer)->selectionChanged(userTriggered);
     1205        static_cast<RenderTextControl*>(renderer)->selectionChanged(userTriggered);
    12061206}
    12071207
    … …  
    24572457
    24582458
    2459 bool Frame::isCharacterSmartReplaceExempt(const QChar&, bool)
     2459bool Frame::isCharacterSmartReplaceExempt(const DeprecatedChar&, bool)
    24602460{
    24612461    // no smart replace
    … …  
    25652565}
    25662566
    2567 void Frame::setSettings(KHTMLSettings *settings)
     2567void Frame::setSettings(Settings *settings)
    25682568{
    25692569    d->m_settings = settings;
    … …  
    27362736
    27372737// FIXME: should this be here?
    2738 bool Frame::scrollOverflow(KWQScrollDirection direction, KWQScrollGranularity granularity)
     2738bool Frame::scrollOverflow(ScrollDirection direction, ScrollGranularity granularity)
    27392739{
    27402740    if (!document()) {

  • trunk/WebCore/page/Frame.h

    r15222 r15253  
    3434#include "EditAction.h"
    3535#include "FrameView.h"
    36 #include "KWQScrollBar.h"
     36#include "WebCoreScrollBar.h"
    3737#include "Node.h"
    3838#include "TextAffinity.h"
    … …  
    4141#include "RenderObject.h"
    4242
    43 class KHTMLSettings;
     43class Settings;
    4444
    4545namespace KJS {
    … …  
    458458  void setInViewSourceMode(bool = true) const;
    459459
    460   const KHTMLSettings* settings() const;
     460  const Settings* settings() const;
    461461
    462462  void setJSStatusBarText(const String&);
    … …  
    503503  void removeEditingStyleFromElement(Element*) const;
    504504  virtual void print() = 0;
    505   virtual bool isCharacterSmartReplaceExempt(const QChar&, bool);
     505  virtual bool isCharacterSmartReplaceExempt(const DeprecatedChar&, bool);
    506506
    507507  // Used to keep the part alive when running a script that might destroy it.
    … …  
    652652  void setOpenedByJS(bool _openedByJS);
    653653
    654   void setSettings(KHTMLSettings*);
     654  void setSettings(Settings*);
    655655
    656656  void provisionalLoadStarted();
    … …  
    682682  void setSelectionFromNone();
    683683
    684   bool scrollOverflow(KWQScrollDirection direction, KWQScrollGranularity granularity);
     684  bool scrollOverflow(ScrollDirection direction, ScrollGranularity granularity);
    685685
    686686  void adjustPageHeight(float* newBottom, float oldTop, float oldBottom, float bottomLimit);

  • trunk/WebCore/page/FramePrivate.h

    r15170 r15253  
    3636#include "Timer.h"
    3737#include "kjs_proxy.h"
    38 #include "KWQKIOGlobal.h"
     38#include "CacheControl.h"
    3939#include <wtf/HashMap.h>
    4040#include "CSSMutableStyleDeclaration.h"
    … …  
    134134        bool m_bPluginsEnabled : 1;
    135135
    136         KHTMLSettings* m_settings;
     136        Settings* m_settings;
    137137
    138138        HashMap<String, String> m_metaData;

  • trunk/WebCore/page/Page.cpp

    r15048 r15253  
    118118}
    119119
    120 void Page::setNeedsReapplyStylesForSettingsChange(KHTMLSettings* settings)
     120void Page::setNeedsReapplyStylesForSettingsChange(Settings* settings)
    121121{
    122122    if (!allPages)

  • trunk/WebCore/page/Page.h

    r14643 r15253  
    3434#endif
    3535
    36 class KHTMLSettings;
     36class Settings;
    3737
    3838namespace WebCore {
    … …  
    6565
    6666        static void setNeedsReapplyStyles();
    67         static void setNeedsReapplyStylesForSettingsChange(KHTMLSettings*);
     67        static void setNeedsReapplyStylesForSettingsChange(Settings*);
    6868       
    6969        // FIXME: Replace this with a function on the selection controller or change it to Selection instead?

  • trunk/WebCore/platform/DeprecatedPtrList.h

    r13852 r15253  
    2424 */
    2525
    26 #ifndef QLIST_H_
    27 #define QLIST_H_
     26#ifndef DeprecatedPtrList_h
     27#define DeprecatedPtrList_h
    2828
    2929#include "DeprecatedPtrListImpl.h"
    … …  
    107107};
    108108
    109 #define Q3PtrList DeprecatedPtrList
    110 #define Q3PtrListIterator DeprecatedPtrListIterator
     109#define DeprecatedPtrList DeprecatedPtrList
     110#define DeprecatedPtrListIterator DeprecatedPtrListIterator
    111111
    112112#endif

  • trunk/WebCore/platform/DeprecatedPtrListImpl.cpp

    r14256 r15253  
    3131#include <wtf/Assertions.h>
    3232
    33 class KWQListNode
     33class DeprecatedListNode
    3434{
    3535public:
    36     KWQListNode(void *d) : data(d), next(0), prev(0) { }
     36    DeprecatedListNode(void *d) : data(d), next(0), prev(0) { }
    3737
    3838    void *data;
    39     KWQListNode *next;
    40     KWQListNode *prev;
     39    DeprecatedListNode *next;
     40    DeprecatedListNode *prev;
    4141};
    4242
    4343
    44 static KWQListNode *copyList(KWQListNode *l, KWQListNode *&tail)
    45 {
    46     KWQListNode *node = l;
    47     KWQListNode *copyHead = 0;
    48     KWQListNode *last = 0;
     44static DeprecatedListNode *copyList(DeprecatedListNode *l, DeprecatedListNode *&tail)
     45{
     46    DeprecatedListNode *node = l;
     47    DeprecatedListNode *copyHead = 0;
     48    DeprecatedListNode *last = 0;
    4949
    5050    while (node != 0) {
    51         KWQListNode *copy = new KWQListNode(node->data);
     51        DeprecatedListNode *copy = new DeprecatedListNode(node->data);
    5252        if (last != 0) {
    5353            last->next = copy;
    … …  
    102102void DeprecatedPtrListImpl::clear(bool deleteItems)
    103103{
    104     KWQListNode *next;
    105    
    106     for (KWQListNode *node = head; node; node = next) {
     104    DeprecatedListNode *next;
     105   
     106    for (DeprecatedListNode *node = head; node; node = next) {
    107107        next = node->next;
    108108        if (deleteItems)
    … …  
    122122void *DeprecatedPtrListImpl::at(unsigned n)
    123123{
    124     KWQListNode *node;
     124    DeprecatedListNode *node;
    125125    if (n >= nodeCount - 1) {
    126126        node = tail;
    … …  
    142142    }
    143143
    144     KWQListNode *node = new KWQListNode((void *)item);
     144    DeprecatedListNode *node = new DeprecatedListNode((void *)item);
    145145
    146146    if (n == 0) {
    … …  
    166166        // iterate to one node before the insertion point, can't be null
    167167        // since we know n > 0 and n < nodeCount
    168         KWQListNode *prevNode = head;
     168        DeprecatedListNode *prevNode = head;
    169169
    170170        for (unsigned i = 0; i < n - 1; i++) {
    … …  
    186186bool DeprecatedPtrListImpl::remove(bool shouldDeleteItem)
    187187{
    188     KWQListNode *node = cur;
     188    DeprecatedListNode *node = cur;
    189189    if (node == 0) {
    190190        return false;
    … …  
    247247bool DeprecatedPtrListImpl::removeRef(const void *item, bool deleteItem)
    248248{
    249     KWQListNode *node;
     249    DeprecatedListNode *node;
    250250
    251251    node = head;
    … …  
    349349    unsigned count = 0;
    350350   
    351     for (KWQListNode *node = head; node; node = node->next) {
     351    for (DeprecatedListNode *node = head; node; node = node->next) {
    352352        if (item == node->data) {
    353353            ++count;
    … …  
    362362int DeprecatedPtrListImpl::findRef(const void *item)
    363363{
    364     KWQListNode *node = head;
     364    DeprecatedListNode *node = head;
    365365    int index = 0;
    366366   

  • trunk/WebCore/platform/DeprecatedPtrListImpl.h

    r13859 r15253  
    2424 */
    2525
    26 #ifndef KWQ_LIST_IMPL_H
    27 #define KWQ_LIST_IMPL_H
     26#ifndef DeprecatedPtrListImpl_h
     27#define DeprecatedPtrListImpl_h
    2828
    29 class KWQListNode;
     29class DeprecatedListNode;
    3030class DeprecatedPtrListImplIterator;
    3131
    … …  
    7979    void removeIterator(DeprecatedPtrListImplIterator *iter) const;
    8080
    81     KWQListNode *head;
    82     KWQListNode *tail;
    83     KWQListNode *cur;
     81    DeprecatedListNode *head;
     82    DeprecatedListNode *tail;
     83    DeprecatedListNode *cur;
    8484    unsigned nodeCount;
    8585    void (*deleteItem)(void *);
    … …  
    109109private:
    110110    const DeprecatedPtrListImpl *list;
    111     KWQListNode *node;
     111    DeprecatedListNode *node;
    112112    DeprecatedPtrListImplIterator *next;
    113113    DeprecatedPtrListImplIterator *prev;

  • trunk/WebCore/platform/DeprecatedString.cpp

    r14816 r15253  
    5151#define DELETE_CHAR(P) fastFree(P)
    5252
    53 #define ALLOC_QCHAR(N) (QChar*)fastMalloc(sizeof(QChar)*(N))
    54 #define REALLOC_QCHAR(P, N) (QChar *)fastRealloc(P, sizeof(QChar)*(N))
     53#define WEBCORE_ALLOCATE_CHARACTERS(N) (DeprecatedChar*)fastMalloc(sizeof(DeprecatedChar)*(N))
     54#define WEBCORE_REALLOCATE_CHARACTERS(P, N) (DeprecatedChar *)fastRealloc(P, sizeof(DeprecatedChar)*(N))
    5555#define DELETE_QCHAR(P) fastFree(P)
    5656
    … …  
    7070}
    7171
    72 static inline KWQStringData **allocateHandle()
     72static inline DeprecatedStringData **allocateHandle()
    7373{
    7474#if CHECK_FOR_HANDLE_LEAKS
    75     return static_cast<KWQStringData **>(fastMalloc(sizeof(KWQStringData *)));
     75    return static_cast<DeprecatedStringData **>(fastMalloc(sizeof(DeprecatedStringData *)));
    7676#endif
    7777
    7878    initializeHandleNodes();
    7979   
    80     return reinterpret_cast<KWQStringData **>(allocateNode(freeNodeAllocationPages));
    81 }
    82 
    83 static void freeHandle(KWQStringData **);
     80    return reinterpret_cast<DeprecatedStringData **>(allocateNode(freeNodeAllocationPages));
     81}
     82
     83static void freeHandle(DeprecatedStringData **);
    8484
    8585#define IS_ASCII_QCHAR(c) ((c).unicode() > 0 && (c).unicode() <= 0xff)
    … …  
    8989const char * const DeprecatedString::null = 0;
    9090
    91 KWQStringData *DeprecatedString::shared_null = 0;
    92 KWQStringData **DeprecatedString::shared_null_handle = 0;
     91DeprecatedStringData *DeprecatedString::shared_null = 0;
     92DeprecatedStringData **DeprecatedString::shared_null_handle = 0;
    9393
    9494// -------------------------------------------------------------------------
    … …  
    9898static inline int ucstrcmp( const DeprecatedString &as, const DeprecatedString &bs )
    9999{
    100     const QChar *a = as.unicode();
    101     const QChar *b = bs.unicode();
     100    const DeprecatedChar *a = as.unicode();
     101    const DeprecatedChar *b = bs.unicode();
    102102    if ( a == b )
    103103        return 0;
    … …  
    115115
    116116
    117 static bool equal(const QChar *a, const char *b, int l)
     117static bool equal(const DeprecatedChar *a, const char *b, int l)
    118118{
    119119    ASSERT(l >= 0);
    … …  
    139139}
    140140
    141 static bool equalCaseInsensitive(const QChar *a, const char *b, int l)
     141static bool equalCaseInsensitive(const DeprecatedChar *a, const char *b, int l)
    142142{
    143143    ASSERT(l >= 0);
    … …  
    150150}
    151151
    152 static bool equalCaseInsensitive(const QChar *a, const QChar *b, int l)
     152static bool equalCaseInsensitive(const DeprecatedChar *a, const DeprecatedChar *b, int l)
    153153{
    154154    ASSERT(l >= 0);
    … …  
    166166}
    167167
    168 static inline bool equalCaseInsensitive(QChar c1, char c2)
     168static inline bool equalCaseInsensitive(DeprecatedChar c1, char c2)
    169169{
    170170    return tolower(c1.unicode()) == tolower(static_cast<unsigned char>(c2));
    171171}
    172172
    173 static bool ok_in_base(QChar c, int base)
     173static bool ok_in_base(DeprecatedChar c, int base)
    174174{
    175175    int uc = c.unicode();
    … …  
    186186
    187187// -------------------------------------------------------------------------
    188 // KWQStringData
     188// DeprecatedStringData
    189189// -------------------------------------------------------------------------
    190190
    … …  
    193193// deleting QStrings.
    194194
    195 KWQStringData::KWQStringData() :
    196         refCount(1), _length(0), _unicode(0), _ascii(0), _maxUnicode(QS_INTERNAL_BUFFER_UCHARS), _isUnicodeValid(0), _isHeapAllocated(0), _maxAscii(QS_INTERNAL_BUFFER_CHARS), _isAsciiValid(1)
     195DeprecatedStringData::DeprecatedStringData() :
     196        refCount(1), _length(0), _unicode(0), _ascii(0), _maxUnicode(WEBCORE_DS_INTERNAL_BUFFER_UCHARS), _isUnicodeValid(0), _isHeapAllocated(0), _maxAscii(WEBCORE_DS_INTERNAL_BUFFER_CHARS), _isAsciiValid(1)
    197197{
    198198    _ascii = _internalBuffer;
    … …  
    200200}
    201201
    202 void KWQStringData::initialize()
     202void DeprecatedStringData::initialize()
    203203{
    204204    refCount = 1;
    … …  
    206206    _unicode = 0;
    207207    _ascii = _internalBuffer;
    208     _maxUnicode = QS_INTERNAL_BUFFER_UCHARS;
     208    _maxUnicode = WEBCORE_DS_INTERNAL_BUFFER_UCHARS;
    209209    _isUnicodeValid = 0;
    210     _maxAscii = QS_INTERNAL_BUFFER_CHARS;
     210    _maxAscii = WEBCORE_DS_INTERNAL_BUFFER_CHARS;
    211211    _isAsciiValid = 1;
    212212    _internalBuffer[0] = 0;
    … …  
    215215
    216216// Don't copy data.
    217 KWQStringData::KWQStringData(QChar *u, unsigned l, unsigned m) :
    218         refCount(1), _length(l), _unicode(u), _ascii(0), _maxUnicode(m), _isUnicodeValid(1), _isHeapAllocated(0), _maxAscii(QS_INTERNAL_BUFFER_CHARS), _isAsciiValid(0)
     217DeprecatedStringData::DeprecatedStringData(DeprecatedChar *u, unsigned l, unsigned m) :
     218        refCount(1), _length(l), _unicode(u), _ascii(0), _maxUnicode(m), _isUnicodeValid(1), _isHeapAllocated(0), _maxAscii(WEBCORE_DS_INTERNAL_BUFFER_CHARS), _isAsciiValid(0)
    219219{
    220220    ASSERT(m >= l);
    … …  
    222222
    223223// Don't copy data.
    224 void KWQStringData::initialize(QChar *u, unsigned l, unsigned m)
     224void DeprecatedStringData::initialize(DeprecatedChar *u, unsigned l, unsigned m)
    225225{
    226226    ASSERT(m >= l);
    … …  
    237237
    238238// Copy data
    239 KWQStringData::KWQStringData(const QChar *u, unsigned l)
     239DeprecatedStringData::DeprecatedStringData(const DeprecatedChar *u, unsigned l)
    240240{
    241241    initialize (u, l);
    … …  
    243243
    244244// Copy data
    245 void KWQStringData::initialize(const QChar *u, unsigned l)
     245void DeprecatedStringData::initialize(const DeprecatedChar *u, unsigned l)
    246246{
    247247    refCount = 1;
    … …  
    253253    _isHeapAllocated = 0;
    254254
    255     if (l > QS_INTERNAL_BUFFER_UCHARS) {
     255    if (l > WEBCORE_DS_INTERNAL_BUFFER_UCHARS) {
    256256        _maxUnicode = ALLOC_QCHAR_GOOD_SIZE(l);
    257         _unicode = ALLOC_QCHAR(_maxUnicode);
    258         memcpy(_unicode, u, l*sizeof(QChar));
     257        _unicode = WEBCORE_ALLOCATE_CHARACTERS(_maxUnicode);
     258        memcpy(_unicode, u, l*sizeof(DeprecatedChar));
    259259    } else {
    260         _maxUnicode = QS_INTERNAL_BUFFER_UCHARS;
    261         _unicode = (QChar *)_internalBuffer;
     260        _maxUnicode = WEBCORE_DS_INTERNAL_BUFFER_UCHARS;
     261        _unicode = (DeprecatedChar *)_internalBuffer;
    262262        if (l)
    263             memcpy(_internalBuffer, u, l*sizeof(QChar));
     263            memcpy(_internalBuffer, u, l*sizeof(DeprecatedChar));
    264264    }
    265265}
    … …  
    267267
    268268// Copy data
    269 KWQStringData::KWQStringData(const char *a, unsigned l)
     269DeprecatedStringData::DeprecatedStringData(const char *a, unsigned l)
    270270{
    271271    initialize(a, l);
    … …  
    274274
    275275// Copy data
    276 void KWQStringData::initialize(const char *a, unsigned l)
     276void DeprecatedStringData::initialize(const char *a, unsigned l)
    277277{
    278278    refCount = 1;
    … …  
    284284    _isHeapAllocated = 0;
    285285
    286     if (l > QS_INTERNAL_BUFFER_CHARS) {
     286    if (l > WEBCORE_DS_INTERNAL_BUFFER_CHARS) {
    287287        _maxAscii = ALLOC_CHAR_GOOD_SIZE(l+1);
    288288        _ascii = ALLOC_CHAR(_maxAscii);
    … …  
    291291        _ascii[l] = 0;
    292292    } else {
    293         _maxAscii = QS_INTERNAL_BUFFER_CHARS;
     293        _maxAscii = WEBCORE_DS_INTERNAL_BUFFER_CHARS;
    294294        _ascii = _internalBuffer;
    295295        if (a)
    … …  
    299299}
    300300
    301 KWQStringData::KWQStringData(KWQStringData &o)
     301DeprecatedStringData::DeprecatedStringData(DeprecatedStringData &o)
    302302    : refCount(1)
    303303    , _length(o._length)
    … …  
    313313    // pointing to the internal buffer. We need to point at the
    314314    // internal buffer in the new object, and copy the characters.
    315     if (_unicode == reinterpret_cast<QChar *>(o._internalBuffer)) {
     315    if (_unicode == reinterpret_cast<DeprecatedChar *>(o._internalBuffer)) {
    316316        if (_isUnicodeValid) {
    317317            ASSERT(!_isAsciiValid || _ascii != o._internalBuffer);
    318             ASSERT(_length <= QS_INTERNAL_BUFFER_UCHARS);
    319             memcpy(_internalBuffer, o._internalBuffer, _length * sizeof(QChar));
    320             _unicode = reinterpret_cast<QChar *>(_internalBuffer);
     318            ASSERT(_length <= WEBCORE_DS_INTERNAL_BUFFER_UCHARS);
     319            memcpy(_internalBuffer, o._internalBuffer, _length * sizeof(DeprecatedChar));
     320            _unicode = reinterpret_cast<DeprecatedChar *>(_internalBuffer);
    321321        } else {
    322322            _unicode = 0;
    … …  
    325325    if (_ascii == o._internalBuffer) {
    326326        if (_isAsciiValid) {
    327             ASSERT(_length <= QS_INTERNAL_BUFFER_CHARS);
     327            ASSERT(_length <= WEBCORE_DS_INTERNAL_BUFFER_CHARS);
    328328            memcpy(_internalBuffer, o._internalBuffer, _length);
    329329            _internalBuffer[_length] = 0;
    … …  
    334334    }
    335335
    336     // Clean up the other KWQStringData just enough so that it can be destroyed
     336    // Clean up the other DeprecatedStringData just enough so that it can be destroyed
    337337    // cleanly. It's not in a good enough state to use, but that's OK. It just
    338     // needs to be in a state where ~KWQStringData won't do anything harmful,
     338    // needs to be in a state where ~DeprecatedStringData won't do anything harmful,
    339339    // and setting these to 0 will do that (preventing any double-free problems).
    340340    o._unicode = 0;
    … …  
    342342}
    343343
    344 KWQStringData *DeprecatedString::makeSharedNull()
     344DeprecatedStringData *DeprecatedString::makeSharedNull()
    345345{
    346346    if (!shared_null) {
    347         shared_null = new KWQStringData;
     347        shared_null = new DeprecatedStringData;
    348348        shared_null->ref();
    349349        shared_null->_maxAscii = 0;
    350350        shared_null->_maxUnicode = 0;
    351         shared_null->_unicode = (QChar *)&shared_null->_internalBuffer[0];
     351        shared_null->_unicode = (DeprecatedChar *)&shared_null->_internalBuffer[0];
    352352        shared_null->_isUnicodeValid = 1;   
    353353    }
    … …  
    355355}
    356356
    357 KWQStringData **DeprecatedString::makeSharedNullHandle()
     357DeprecatedStringData **DeprecatedString::makeSharedNullHandle()
    358358{
    359359    if (!shared_null_handle) {
    … …  
    364364}
    365365
    366 KWQStringData::~KWQStringData()
     366DeprecatedStringData::~DeprecatedStringData()
    367367{
    368368    ASSERT(refCount == 0);
    … …  
    373373}
    374374
    375 void KWQStringData::increaseAsciiSize(unsigned size)
     375void DeprecatedStringData::increaseAsciiSize(unsigned size)
    376376{
    377377    ASSERT(this != DeprecatedString::shared_null);
    … …  
    398398
    399399
    400 void KWQStringData::increaseUnicodeSize(unsigned size)
     400void DeprecatedStringData::increaseUnicodeSize(unsigned size)
    401401{
    402402    ASSERT(size > _length);
    … …  
    410410
    411411    if (isUnicodeInternal()) {
    412         QChar *newUni = ALLOC_QCHAR(newSize);
     412        DeprecatedChar *newUni = WEBCORE_ALLOCATE_CHARACTERS(newSize);
    413413        if (_length)
    414             memcpy(newUni, _unicode, _length*sizeof(QChar));
     414            memcpy(newUni, _unicode, _length*sizeof(DeprecatedChar));
    415415        _unicode = newUni;
    416416    } else {
    417         _unicode = REALLOC_QCHAR(_unicode, newSize);
     417        _unicode = WEBCORE_REALLOCATE_CHARACTERS(_unicode, newSize);
    418418    }
    419419   
    … …  
    424424
    425425
    426 char *KWQStringData::makeAscii()
     426char *DeprecatedStringData::makeAscii()
    427427{
    428428    ASSERT(this != DeprecatedString::shared_null);
    429429       
    430430    if (_isUnicodeValid){
    431         QChar copyBuf[QS_INTERNAL_BUFFER_CHARS];
    432         QChar *str;
     431        DeprecatedChar copyBuf[WEBCORE_DS_INTERNAL_BUFFER_CHARS];
     432        DeprecatedChar *str;
    433433       
    434434        if (_ascii && !isAsciiInternal())
    435435            DELETE_QCHAR(_ascii);
    436436           
    437         if (_length < QS_INTERNAL_BUFFER_CHARS){
     437        if (_length < WEBCORE_DS_INTERNAL_BUFFER_CHARS){
    438438            if (isUnicodeInternal()) {
    439439                unsigned i = _length;
    440                 QChar *tp = &copyBuf[0], *fp = _unicode;
     440                DeprecatedChar *tp = &copyBuf[0], *fp = _unicode;
    441441                while (i--)
    442442                    *tp++ = *fp++;
    … …  
    447447                str = _unicode;
    448448            _ascii = _internalBuffer;
    449             _maxAscii = QS_INTERNAL_BUFFER_CHARS;
     449            _maxAscii = WEBCORE_DS_INTERNAL_BUFFER_CHARS;
    450450        }
    451451        else {
    … …  
    471471
    472472
    473 QChar *KWQStringData::makeUnicode()
     473DeprecatedChar *DeprecatedStringData::makeUnicode()
    474474{
    475475    ASSERT(this != DeprecatedString::shared_null);
    476476       
    477477    if (_isAsciiValid){
    478         char copyBuf[QS_INTERNAL_BUFFER_CHARS];
     478        char copyBuf[WEBCORE_DS_INTERNAL_BUFFER_CHARS];
    479479        char *str;
    480480       
    … …  
    482482            DELETE_QCHAR(_unicode);
    483483           
    484         if (_length <= QS_INTERNAL_BUFFER_UCHARS){
     484        if (_length <= WEBCORE_DS_INTERNAL_BUFFER_UCHARS){
    485485            if (isAsciiInternal()) {
    486486                unsigned i = _length;
    … …  
    493493            else
    494494                str = _ascii;
    495             _unicode = (QChar *)_internalBuffer;
    496             _maxUnicode = QS_INTERNAL_BUFFER_UCHARS;
     495            _unicode = (DeprecatedChar *)_internalBuffer;
     496            _maxUnicode = WEBCORE_DS_INTERNAL_BUFFER_UCHARS;
    497497        }
    498498        else {
    499499            unsigned newSize = ALLOC_QCHAR_GOOD_SIZE(_length);
    500             _unicode = ALLOC_QCHAR(newSize);
     500            _unicode = WEBCORE_ALLOCATE_CHARACTERS(newSize);
    501501            _maxUnicode = newSize;
    502502            str = _ascii;
    503503        }
    504504        unsigned i = _length;
    505         QChar *cp = _unicode;
     505        DeprecatedChar *cp = _unicode;
    506506        while ( i-- )
    507507            *cp++ = *str++;
    … …  
    558558inline void DeprecatedString::detachIfInternal()
    559559{
    560     KWQStringData *oldData = *dataHandle;
     560    DeprecatedStringData *oldData = *dataHandle;
    561561    if (oldData->refCount > 1 && oldData == &internalData) {
    562         KWQStringData *newData = new KWQStringData(*oldData);
     562        DeprecatedStringData *newData = new DeprecatedStringData(*oldData);
    563563        newData->_isHeapAllocated = 1;
    564564        newData->refCount = oldData->refCount;
    … …  
    569569}
    570570
    571 const QChar *DeprecatedString::stableUnicode()
     571const DeprecatedChar *DeprecatedString::stableUnicode()
    572572{
    573573    // if we're using the internal data of another string, detach now
    … …  
    593593   
    594594    // Remove our reference. This should always be the last reference
    595     // if *dataHandle points to our internal KWQStringData. If we just detached,
     595    // if *dataHandle points to our internal DeprecatedStringData. If we just detached,
    596596    // this will remove the extra ref from the new handle.
    597597    dataHandle[0]->deref();
    … …  
    616616
    617617
    618 // Careful, just used by QConstString
    619 DeprecatedString::DeprecatedString(KWQStringData *constData, bool /*dummy*/)
     618// Careful, just used by DeprecatedConstString
     619DeprecatedString::DeprecatedString(DeprecatedStringData *constData, bool /*dummy*/)
    620620{
    621621    internalData.deref();
    … …  
    623623    *dataHandle = constData;
    624624   
    625     // The QConstString constructor allocated the KWQStringData.
     625    // The DeprecatedConstString constructor allocated the DeprecatedStringData.
    626626    constData->_isHeapAllocated = 1;
    627627}
    628628
    629629
    630 DeprecatedString::DeprecatedString(QChar qc)
     630DeprecatedString::DeprecatedString(DeprecatedChar qc)
    631631{
    632632    dataHandle = allocateHandle();
    633633
    634     // Copy the QChar.
     634    // Copy the DeprecatedChar.
    635635    if (IS_ASCII_QCHAR(qc)) {
    636636        char c = qc.unicode();
    … …  
    644644}
    645645
    646 DeprecatedString::DeprecatedString(const QChar *unicode, unsigned length)
     646DeprecatedString::DeprecatedString(const DeprecatedChar *unicode, unsigned length)
    647647{
    648648    if (!unicode && !length) {
    … …  
    653653        dataHandle = allocateHandle();
    654654
    655         // Copy the QChar *
     655        // Copy the DeprecatedChar *
    656656        *dataHandle = &internalData;
    657657        internalData.initialize(unicode, length);
    … …  
    714714}
    715715
    716 DeprecatedString &DeprecatedString::operator=(QChar qc)
     716DeprecatedString &DeprecatedString::operator=(DeprecatedChar qc)
    717717{
    718718    return *this = DeprecatedString(qc);
    … …  
    721721DeprecatedString &DeprecatedString::operator=(char ch)
    722722{
    723     return *this = DeprecatedString(QChar(ch));
    724 }
    725 
    726 QChar DeprecatedString::at(unsigned i) const
    727 {
    728     KWQStringData *thisData = *dataHandle;
     723    return *this = DeprecatedString(DeprecatedChar(ch));
     724}
     725
     726DeprecatedChar DeprecatedString::at(unsigned i) const
     727{
     728    DeprecatedStringData *thisData = *dataHandle;
    729729   
    730730    if (i >= thisData->_length)
    … …  
    750750    if (!chs)
    751751        return isEmpty() ? 0 : 1;
    752     KWQStringData *d = dataHandle[0];
     752    DeprecatedStringData *d = dataHandle[0];
    753753    if (d->_isAsciiValid)
    754754        return strcmp(ascii(), chs);
    755     const QChar *s = unicode();
     755    const DeprecatedChar *s = unicode();
    756756    unsigned len = d->_length;
    757757    for (unsigned i = 0; i != len; ++i) {
    … …  
    759759        if (!c2)
    760760            return 1;
    761         QChar c1 = s[i];
     761        DeprecatedChar c1 = s[i];
    762762        if (c1.unicode() < c2)
    763763            return -1;
    … …  
    779779    }
    780780    else if (dataHandle[0]->_isUnicodeValid){
    781         const QChar *uni = unicode();
     781        const DeprecatedChar *uni = unicode();
    782782       
    783783        for ( int i =0; i < (int) s.dataHandle[0]->_length; i++ ) {
    … …  
    794794bool DeprecatedString::startsWith(const char *prefix) const
    795795{
    796     KWQStringData *data = *dataHandle;
     796    DeprecatedStringData *data = *dataHandle;
    797797
    798798    unsigned prefixLength = strlen(prefix);
    … …  
    804804            return false;
    805805        }
    806         const QChar *uni = data->_unicode;       
     806        const DeprecatedChar *uni = data->_unicode;       
    807807        for (unsigned i = 0; i < prefixLength; ++i) {
    808808            if (uni[i] != prefix[i]) {
    … …  
    827827    }
    828828
    829     KWQStringData *data = *dataHandle;
     829    DeprecatedStringData *data = *dataHandle;
    830830
    831831    unsigned prefixLength = strlen(prefix);
    … …  
    837837            return false;
    838838        }
    839         const QChar *uni = data->_unicode;       
     839        const DeprecatedChar *uni = data->_unicode;       
    840840        for (unsigned i = 0; i < prefixLength; ++i) {
    841841            if (!equalCaseInsensitive(uni[i], prefix[i])) {
    … …  
    849849bool DeprecatedString::endsWith(const DeprecatedString& s) const
    850850{
    851     const QChar *uni = unicode();
     851    const DeprecatedChar *uni = unicode();
    852852
    853853    int length = dataHandle[0]->_length;
    … …  
    869869}
    870870
    871 int DeprecatedString::find(QChar qc, int index) const
     871int DeprecatedString::find(DeprecatedChar qc, int index) const
    872872{
    873873    if (dataHandle[0]->_isAsciiValid) {
    … …  
    895895    }
    896896    else if (dataHandle[0]->_isUnicodeValid)
    897         return find(QChar(ch), index, true);
     897        return find(DeprecatedChar(ch), index, true);
    898898    else
    899899        FATAL("invalid character cache");
    … …  
    924924        return -1;
    925925
    926     const QChar *uthis = unicode() + index;
    927     const QChar *ustr = str.unicode();
     926    const DeprecatedChar *uthis = unicode() + index;
     927    const DeprecatedChar *ustr = str.unicode();
    928928    unsigned hthis = 0;
    929929    unsigned hstr = 0;
    … …  
    936936        i = 0;
    937937        while ( true ) {
    938             if ( hthis == hstr && memcmp(uthis + i, ustr, lstr * sizeof(QChar)) == 0 )
     938            if ( hthis == hstr && memcmp(uthis + i, ustr, lstr * sizeof(DeprecatedChar)) == 0 )
    939939                return index + i;
    940940            if ( i == delta )
    … …  
    971971        return -1;
    972972
    973     KWQStringData *data = *dataHandle;
     973    DeprecatedStringData *data = *dataHandle;
    974974
    975975    int chsLength = strlen(chs);
    … …  
    10041004        ASSERT(data->_isUnicodeValid);
    10051005
    1006         const QChar *ptr = data->_unicode + index - 1;
     1006        const DeprecatedChar *ptr = data->_unicode + index - 1;
    10071007        if (caseSensitive) {
    1008             QChar c = *chs;
     1008            DeprecatedChar c = *chs;
    10091009            do {
    10101010                if (*++ptr == c && equal(ptr + 1, chsPlusOne, chsLengthMinusOne)) {
    … …  
    10481048    }
    10491049    else if (dataHandle[0]->_isUnicodeValid)
    1050         return findRev(DeprecatedString(QChar(ch)), index);
     1050        return findRev(DeprecatedString(DeprecatedChar(ch)), index);
    10511051    else
    10521052        FATAL("invalid character cache");
    … …  
    10771077        index = delta;
    10781078
    1079     const QChar *uthis = unicode();
    1080     const QChar *ustr = str.unicode();
     1079    const DeprecatedChar *uthis = unicode();
     1080    const DeprecatedChar *ustr = str.unicode();
    10811081    unsigned hthis = 0;
    10821082    unsigned hstr = 0;
    … …  
    10891089        i = index;
    10901090        while ( true ) {
    1091             if ( hthis == hstr && memcmp(uthis + i, ustr, lstr * sizeof(QChar)) == 0 )
     1091            if ( hthis == hstr && memcmp(uthis + i, ustr, lstr * sizeof(DeprecatedChar)) == 0 )
    10921092                return i;
    10931093            if ( i == 0 )
    … …  
    11191119
    11201120
    1121 int DeprecatedString::contains(QChar c, bool cs) const
     1121int DeprecatedString::contains(DeprecatedChar c, bool cs) const
    11221122{
    11231123    int count = 0;
    11241124   
    1125     KWQStringData *data = *dataHandle;
     1125    DeprecatedStringData *data = *dataHandle;
    11261126   
    11271127    if (data->_isAsciiValid) {
    … …  
    11421142    } else {
    11431143        ASSERT(data->_isUnicodeValid);
    1144         const QChar *uc = data->_unicode;
     1144        const DeprecatedChar *uc = data->_unicode;
    11451145        int n = data->_length;
    11461146        if (cs) {                                       // case sensitive
    … …  
    11611161int DeprecatedString::contains(char ch) const
    11621162{
    1163     return contains(QChar(ch), true);
     1163    return contains(DeprecatedChar(ch), true);
    11641164}
    11651165
    … …  
    11721172    char c = *str;
    11731173
    1174     KWQStringData *data = *dataHandle;
     1174    DeprecatedStringData *data = *dataHandle;
    11751175    int n = data->_length;
    11761176
    … …  
    11971197    } else {
    11981198        ASSERT(data->_isUnicodeValid);
    1199         const QChar *p = data->_unicode;
     1199        const DeprecatedChar *p = data->_unicode;
    12001200        if (caseSensitive) {
    12011201            do {
    … …  
    12201220        return 0;
    12211221
    1222     const QChar *strP = str.unicode();
     1222    const DeprecatedChar *strP = str.unicode();
    12231223    int len = str.dataHandle[0]->_length;
    1224     QChar c = *strP;
    1225 
    1226     const QChar *p = unicode();
     1224    DeprecatedChar c = *strP;
     1225
     1226    const DeprecatedChar *p = unicode();
    12271227    int n = dataHandle[0]->_length;
    12281228
    … …  
    12341234
    12351235    if (caseSensitive) {
    1236         int byteCount = len * sizeof(QChar);
     1236        int byteCount = len * sizeof(DeprecatedChar);
    12371237        do {
    12381238            count += *p == c && memcmp(p, strP, byteCount) == 0;
    … …  
    12511251bool DeprecatedString::isAllASCII() const
    12521252{
    1253     KWQStringData *data = *dataHandle;
     1253    DeprecatedStringData *data = *dataHandle;
    12541254
    12551255    int n = data->_length;
    … …  
    12641264    } else {
    12651265        ASSERT(data->_isUnicodeValid);
    1266         const QChar *p = data->_unicode;
     1266        const DeprecatedChar *p = data->_unicode;
    12671267        while (n--) {
    12681268            if ((*p++).unicode() > 0x7F) {
    … …  
    12771277bool DeprecatedString::isAllLatin1() const
    12781278{
    1279     KWQStringData *data = *dataHandle;
     1279    DeprecatedStringData *data = *dataHandle;
    12801280
    12811281    if (data->_isAsciiValid) {
    … …  
    12851285    ASSERT(data->_isUnicodeValid);
    12861286    int n = data->_length;
    1287     const QChar *p = data->_unicode;
     1287    const DeprecatedChar *p = data->_unicode;
    12881288    while (n--) {
    12891289        if ((*p++).unicode() > 0xFF) {
    … …  
    12971297bool DeprecatedString::hasFastLatin1() const
    12981298{
    1299     KWQStringData *data = *dataHandle;
     1299    DeprecatedStringData *data = *dataHandle;
    13001300    return data->_isAsciiValid;
    13011301}
    … …  
    13031303void DeprecatedString::copyLatin1(char *buffer, unsigned position, unsigned maxLength) const
    13041304{
    1305     KWQStringData *data = *dataHandle;
     1305    DeprecatedStringData *data = *dataHandle;
    13061306
    13071307    int length = data->_length;
    … …  
    13211321
    13221322    ASSERT(data->_isUnicodeValid);
    1323     const QChar* uc = data->_unicode + position;
     1323    const DeprecatedChar* uc = data->_unicode + position;
    13241324    while (length--)
    13251325        *buffer++ = (*uc++).latin1();
    … …  
    13521352int DeprecatedString::toInt(bool *ok, int base) const
    13531353{
    1354     const QChar *p = unicode();
     1354    const DeprecatedChar *p = unicode();
    13551355    int val=0;
    13561356    int l = dataHandle[0]->_length;
    … …  
    14051405unsigned DeprecatedString::toUInt(bool *ok, int base) const
    14061406{
    1407     const QChar *p = unicode();
     1407    const DeprecatedChar *p = unicode();
    14081408    unsigned val=0;
    14091409    int l = dataHandle[0]->_length;
    … …  
    14761476{
    14771477    if (dataHandle && *dataHandle) {
    1478         KWQStringData &data = **dataHandle;
     1478        DeprecatedStringData &data = **dataHandle;
    14791479       
    14801480        // clip length
    … …  
    15161516{
    15171517    DeprecatedString s(*this);
    1518     KWQStringData *d = *s.dataHandle;
     1518    DeprecatedStringData *d = *s.dataHandle;
    15191519    int l = d->_length;
    15201520    if (l) {
    … …  
    15391539        else {
    15401540            ASSERT(d->_isUnicodeValid);
    1541             QChar *p = d->_unicode;
     1541            DeprecatedChar *p = d->_unicode;
    15421542            while (l--) {
    1543                 QChar c = *p;
     1543                DeprecatedChar c = *p;
    15441544                // FIXME: Doesn't work for 0x80-0xFF.
    15451545                if (IS_ASCII_QCHAR(c)) {
    … …  
    15541554                    }
    15551555                } else {
    1556                     QChar clower = c.lower();
     1556                    DeprecatedChar clower = c.lower();
    15571557                    if (clower != c) {
    15581558                        if (!detached) {
    … …  
    16001600        result.setLength( l );
    16011601        if ( l )
    1602             memcpy(result.forceUnicode(), &unicode()[start], sizeof(QChar)*l );
     1602            memcpy(result.forceUnicode(), &unicode()[start], sizeof(DeprecatedChar)*l );
    16031603    }
    16041604    else
    … …  
    16221622        char *to = const_cast<char*>(result.ascii());
    16231623        while ( true ) {
    1624             while ( from!=fromend && QChar(*from).isSpace() )
     1624            while ( from!=fromend && DeprecatedChar(*from).isSpace() )
    16251625                from++;
    1626             while ( from!=fromend && !QChar(*from).isSpace() )
     1626            while ( from!=fromend && !DeprecatedChar(*from).isSpace() )
    16271627                to[outc++] = *from++;
    16281628            if ( from!=fromend )
    … …  
    16371637    else if (dataHandle[0]->_isUnicodeValid){
    16381638        result.setLength( dataHandle[0]->_length );
    1639         const QChar *from = unicode();
    1640         const QChar *fromend = from + dataHandle[0]->_length;
     1639        const DeprecatedChar *from = unicode();
     1640        const DeprecatedChar *fromend = from + dataHandle[0]->_length;
    16411641        int outc=0;
    16421642       
    1643         QChar *to = result.forceUnicode();
     1643        DeprecatedChar *to = result.forceUnicode();
    16441644        while ( true ) {
    16451645            while ( from!=fromend && from->isSpace() )
    … …  
    16681668
    16691669
    1670 DeprecatedString &DeprecatedString::setUnicode(const QChar *uni, unsigned len)
     1670DeprecatedString &DeprecatedString::setUnicode(const DeprecatedChar *uni, unsigned len)
    16711671{
    16721672    detachAndDiscardCharacters();
    … …  
    16861686            freeHandle(dataHandle);
    16871687        dataHandle = allocateHandle();
    1688         *dataHandle = new KWQStringData(uni, len);
     1688        *dataHandle = new DeprecatedStringData(uni, len);
    16891689        dataHandle[0]->_isHeapAllocated = 1;
    16901690    } else {
    16911691        if ( uni )
    1692             memcpy( (void *)unicode(), uni, sizeof(QChar)*len );
     1692            memcpy( (void *)unicode(), uni, sizeof(DeprecatedChar)*len );
    16931693        dataHandle[0]->_length = len;
    16941694        dataHandle[0]->_isAsciiValid = 0;
    … …  
    17161716            freeHandle(dataHandle);
    17171717        dataHandle = allocateHandle();
    1718         *dataHandle = new KWQStringData(str,len);
     1718        *dataHandle = new DeprecatedStringData(str,len);
    17191719        dataHandle[0]->_isHeapAllocated = 1;
    17201720    } else {
    … …  
    17861786            freeHandle(dataHandle);
    17871787        dataHandle = allocateHandle();
    1788         *dataHandle = new KWQStringData((char *)0, len);
     1788        *dataHandle = new DeprecatedStringData((char *)0, len);
    17891789        dataHandle[0]->_isHeapAllocated = 1;
    17901790    } else {
    … …  
    18041804}
    18051805
    1806 DeprecatedString &DeprecatedString::prepend(const QChar *characters, unsigned length)
     1806DeprecatedString &DeprecatedString::prepend(const DeprecatedChar *characters, unsigned length)
    18071807{
    18081808    return insert(0, characters, length);
    … …  
    18191819}
    18201820
    1821 DeprecatedString &DeprecatedString::append(const QChar *characters, unsigned length)
     1821DeprecatedString &DeprecatedString::append(const DeprecatedChar *characters, unsigned length)
    18221822{
    18231823    return insert(dataHandle[0]->_length, characters, length);
    … …  
    18491849    else if (dataHandle[0]->_isUnicodeValid){
    18501850        unsigned originalLength = dataHandle[0]->_length;
    1851         QChar *targetChars;
     1851        DeprecatedChar *targetChars;
    18521852       
    18531853        // Ensure that we have enough space.
    18541854        setLength (originalLength + insertLength);
    1855         targetChars = (QChar *)unicode();
     1855        targetChars = (DeprecatedChar *)unicode();
    18561856       
    18571857        // Move tail to make space for inserted characters.
    1858         memmove (targetChars+(index+insertLength), targetChars+index, (originalLength-index)*sizeof(QChar));
     1858        memmove (targetChars+(index+insertLength), targetChars+index, (originalLength-index)*sizeof(DeprecatedChar));
    18591859
    18601860        // Insert characters.
    18611861        unsigned i = insertLength;
    1862         QChar *target = targetChars+index;
     1862        DeprecatedChar *target = targetChars+index;
    18631863       
    18641864        while (i--)
    … …  
    18831883        unsigned insertLength = qs.dataHandle[0]->_length;
    18841884        unsigned originalLength = dataHandle[0]->_length;
    1885         QChar *targetChars;
     1885        DeprecatedChar *targetChars;
    18861886       
    18871887        // Ensure that we have enough space.
    … …  
    18901890       
    18911891        // Move tail to make space for inserted characters.
    1892         memmove (targetChars+(index+insertLength), targetChars+index, (originalLength-index)*sizeof(QChar));
     1892        memmove (targetChars+(index+insertLength), targetChars+index, (originalLength-index)*sizeof(DeprecatedChar));
    18931893
    18941894        // Insert characters.
    18951895        if (qs.dataHandle[0]->_isAsciiValid){
    18961896            unsigned i = insertLength;
    1897             QChar *target = targetChars+index;
     1897            DeprecatedChar *target = targetChars+index;
    18981898            char *a = const_cast<char*>(qs.ascii());
    18991899           
    … …  
    19021902        }
    19031903        else {
    1904             QChar *insertChars = (QChar *)qs.unicode();
    1905             memcpy (targetChars+index, insertChars, insertLength*sizeof(QChar));
     1904            DeprecatedChar *insertChars = (DeprecatedChar *)qs.unicode();
     1905            memcpy (targetChars+index, insertChars, insertLength*sizeof(DeprecatedChar));
    19061906        }
    19071907       
    … …  
    19131913
    19141914
    1915 DeprecatedString &DeprecatedString::insert(unsigned index, const QChar *insertChars, unsigned insertLength)
     1915DeprecatedString &DeprecatedString::insert(unsigned index, const DeprecatedChar *insertChars, unsigned insertLength)
    19161916{
    19171917    if (insertLength == 0)
    … …  
    19231923    setLength(originalLength + insertLength);
    19241924
    1925     QChar *targetChars = const_cast<QChar *>(unicode());
     1925    DeprecatedChar *targetChars = const_cast<DeprecatedChar *>(unicode());
    19261926    if (originalLength > index) {
    1927         memmove(targetChars + index + insertLength, targetChars + index, (originalLength - index) * sizeof(QChar));
    1928     }
    1929     memcpy(targetChars + index, insertChars, insertLength * sizeof(QChar));
     1927        memmove(targetChars + index + insertLength, targetChars + index, (originalLength - index) * sizeof(DeprecatedChar));
     1928    }
     1929    memcpy(targetChars + index, insertChars, insertLength * sizeof(DeprecatedChar));
    19301930   
    19311931    return *this;
    … …  
    19331933
    19341934
    1935 DeprecatedString &DeprecatedString::insert(unsigned index, QChar qc)
     1935DeprecatedString &DeprecatedString::insert(unsigned index, DeprecatedChar qc)
    19361936{
    19371937    detach();
    … …  
    19571957    else {
    19581958        unsigned originalLength = dataHandle[0]->_length;
    1959         QChar *targetChars;
     1959        DeprecatedChar *targetChars;
    19601960       
    19611961        // Ensure that we have enough space.
    … …  
    19641964       
    19651965        // Move tail to make space for inserted character.
    1966         memmove (targetChars+(index+1), targetChars+index, (originalLength-index)*sizeof(QChar));
     1966        memmove (targetChars+(index+1), targetChars+index, (originalLength-index)*sizeof(DeprecatedChar));
    19671967
    19681968        targetChars[index] = qc;
    … …  
    19961996    else if (dataHandle[0]->_isUnicodeValid){
    19971997        unsigned originalLength = dataHandle[0]->_length;
    1998         QChar *targetChars;
     1998        DeprecatedChar *targetChars;
    19991999       
    20002000        // Ensure that we have enough space.
    20012001        setLength (originalLength + 1);
    2002         targetChars = (QChar *)unicode();
     2002        targetChars = (DeprecatedChar *)unicode();
    20032003       
    20042004        // Move tail to make space for inserted character.
    2005         memmove (targetChars+(index+1), targetChars+index, (originalLength-index)*sizeof(QChar));
    2006 
    2007         targetChars[index] = (QChar)ch;
     2005        memmove (targetChars+(index+1), targetChars+index, (originalLength-index)*sizeof(DeprecatedChar));
     2006
     2007        targetChars[index] = (DeprecatedChar)ch;
    20082008    }
    20092009    else
    … …  
    20132013}
    20142014
    2015 // Copy KWQStringData if necessary. Must be called before the string data is mutated.
     2015// Copy DeprecatedStringData if necessary. Must be called before the string data is mutated.
    20162016void DeprecatedString::detach()
    20172017{
    2018     KWQStringData *oldData = *dataHandle;
     2018    DeprecatedStringData *oldData = *dataHandle;
    20192019
    20202020    if (oldData->refCount == 1 && oldData != shared_null)
    … …  
    20222022
    20232023    // Copy data for this string so we can safely mutate it.
    2024     KWQStringData *newData;
     2024    DeprecatedStringData *newData;
    20252025    if (oldData->_isAsciiValid)
    2026         newData = new KWQStringData(oldData->ascii(), oldData->_length);
     2026        newData = new DeprecatedStringData(oldData->ascii(), oldData->_length);
    20272027    else
    2028         newData = new KWQStringData(oldData->unicode(), oldData->_length);
     2028        newData = new DeprecatedStringData(oldData->unicode(), oldData->_length);
    20292029    newData->_isHeapAllocated = 1;
    20302030
    … …  
    20742074        else if (dataHandle[0]->_isUnicodeValid){
    20752075            memmove( dataHandle[0]->unicode()+index, dataHandle[0]->unicode()+index+len,
    2076                     sizeof(QChar)*(olen-index-len) );
     2076                    sizeof(DeprecatedChar)*(olen-index-len) );
    20772077            setLength( olen-len );
    20782078        }
    … …  
    20992099}
    21002100
    2101 DeprecatedString &DeprecatedString::replace(QChar pattern, const DeprecatedString &str)
     2101DeprecatedString &DeprecatedString::replace(DeprecatedChar pattern, const DeprecatedString &str)
    21022102{
    21032103    int slen = str.dataHandle[0]->_length;
    … …  
    21472147
    21482148
    2149 DeprecatedString &DeprecatedString::replace(QChar oldChar, QChar newChar)
     2149DeprecatedString &DeprecatedString::replace(DeprecatedChar oldChar, DeprecatedChar newChar)
    21502150{
    21512151    if (oldChar != newChar && find(oldChar) != -1) {
    … …  
    21642164            }
    21652165        } else {
    2166             QChar *p = const_cast<QChar *>(unicode());
     2166            DeprecatedChar *p = const_cast<DeprecatedChar *>(unicode());
    21672167            dataHandle[0]->_isAsciiValid = 0;
    21682168            for (unsigned i = 0; i != length; ++i) {
    … …  
    21782178
    21792179
    2180 QChar *DeprecatedString::forceUnicode()
     2180DeprecatedChar *DeprecatedString::forceUnicode()
    21812181{
    21822182    detach();
    2183     QChar *result = const_cast<QChar *>(unicode());
     2183    DeprecatedChar *result = const_cast<DeprecatedChar *>(unicode());
    21842184    dataHandle[0]->_isAsciiValid = 0;
    21852185    return result;
    … …  
    22282228}
    22292229
    2230 void DeprecatedString::fill(QChar qc, int len)
     2230void DeprecatedString::fill(DeprecatedChar qc, int len)
    22312231{
    22322232    detachAndDiscardCharacters();
    … …  
    22542254        } else {
    22552255            setLength(len);
    2256             QChar *nd = forceUnicode();
     2256            DeprecatedChar *nd = forceUnicode();
    22572257            while (len--)
    22582258                *nd++ = qc;
    … …  
    22612261}
    22622262
    2263 DeprecatedString &DeprecatedString::append(QChar qc)
     2263DeprecatedString &DeprecatedString::append(DeprecatedChar qc)
    22642264{
    22652265    detach();
    22662266   
    2267     KWQStringData *thisData = *dataHandle;
     2267    DeprecatedStringData *thisData = *dataHandle;
    22682268    if (thisData->_isUnicodeValid && thisData->_length + 1 < thisData->_maxUnicode){
    22692269        thisData->_unicode[thisData->_length] = qc;
    … …  
    22862286    detach();
    22872287   
    2288     KWQStringData *thisData = *dataHandle;
     2288    DeprecatedStringData *thisData = *dataHandle;
    22892289    if (thisData->_isUnicodeValid && thisData->_length + 1 < thisData->_maxUnicode){
    2290         thisData->_unicode[thisData->_length] = (QChar)ch;
     2290        thisData->_unicode[thisData->_length] = (DeprecatedChar)ch;
    22912291        thisData->_length++;
    22922292        thisData->_isAsciiValid = 0;
    … …  
    23172317    }
    23182318    return s1.dataHandle[0]->_length == s2.dataHandle[0]->_length
    2319         && memcmp(s1.unicode(), s2.unicode(), s1.dataHandle[0]->_length * sizeof(QChar)) == 0;
     2319        && memcmp(s1.unicode(), s2.unicode(), s1.dataHandle[0]->_length * sizeof(DeprecatedChar)) == 0;
    23202320}
    23212321
    … …  
    23242324    if (!chs)
    23252325        return s1.isNull();
    2326     KWQStringData *d = s1.dataHandle[0];
     2326    DeprecatedStringData *d = s1.dataHandle[0];
    23272327    unsigned len = d->_length;
    23282328    if (d->_isAsciiValid) {
    … …  
    23342334        }
    23352335    } else {
    2336         const QChar *s = s1.unicode();
     2336        const DeprecatedChar *s = s1.unicode();
    23372337        for (unsigned i = 0; i != len; ++i) {
    23382338            char c = chs[i];
    … …  
    23542354}
    23552355
    2356 DeprecatedString operator+(const DeprecatedString &qs, QChar qc)
     2356DeprecatedString operator+(const DeprecatedString &qs, DeprecatedChar qc)
    23572357{
    23582358    return DeprecatedString(qs) += qc;
    … …  
    23692369}
    23702370
    2371 DeprecatedString operator+(QChar qc, const DeprecatedString &qs)
     2371DeprecatedString operator+(DeprecatedChar qc, const DeprecatedString &qs)
    23722372{
    23732373    return DeprecatedString(qc) += qs;
    … …  
    23762376DeprecatedString operator+(char ch, const DeprecatedString &qs)
    23772377{
    2378     return DeprecatedString(QChar(ch)) += qs;
    2379 }
    2380 
    2381 QConstString::QConstString(const QChar* unicode, unsigned length) :
    2382     DeprecatedString(new KWQStringData((QChar *)unicode, length, length), true)
    2383 {
    2384 }
    2385 
    2386 QConstString::~QConstString()
    2387 {
    2388     KWQStringData *data = *dataHandle;
     2378    return DeprecatedString(DeprecatedChar(ch)) += qs;
     2379}
     2380
     2381DeprecatedConstString::DeprecatedConstString(const DeprecatedChar* unicode, unsigned length) :
     2382    DeprecatedString(new DeprecatedStringData((DeprecatedChar *)unicode, length, length), true)
     2383{
     2384}
     2385
     2386DeprecatedConstString::~DeprecatedConstString()
     2387{
     2388    DeprecatedStringData *data = *dataHandle;
    23892389    if (data->refCount > 1) {
    2390         QChar *tp;
    2391         if (data->_length <= QS_INTERNAL_BUFFER_UCHARS) {
    2392             data->_maxUnicode = QS_INTERNAL_BUFFER_UCHARS;
    2393             tp = (QChar *)&data->_internalBuffer[0];
     2390        DeprecatedChar *tp;
     2391        if (data->_length <= WEBCORE_DS_INTERNAL_BUFFER_UCHARS) {
     2392            data->_maxUnicode = WEBCORE_DS_INTERNAL_BUFFER_UCHARS;
     2393            tp = (DeprecatedChar *)&data->_internalBuffer[0];
    23942394        } else {
    23952395            data->_maxUnicode = ALLOC_QCHAR_GOOD_SIZE(data->_length);
    2396             tp = ALLOC_QCHAR(data->_maxUnicode);
    2397         }
    2398         memcpy(tp, data->_unicode, data->_length * sizeof(QChar));
     2396            tp = WEBCORE_ALLOCATE_CHARACTERS(data->_maxUnicode);
     2397        }
     2398        memcpy(tp, data->_unicode, data->_length * sizeof(DeprecatedChar));
    23992399        data->_unicode = tp;
    24002400        data->_isUnicodeValid = 1;
    … …  
    25042504}
    25052505
    2506 void freeHandle(KWQStringData **_free)
     2506void freeHandle(DeprecatedStringData **_free)
    25072507{
    25082508#if CHECK_FOR_HANDLE_LEAKS
    … …  
    25702570        dataHandle = allocateHandle();
    25712571        *dataHandle = &internalData;
    2572         internalData.initialize(reinterpret_cast<const QChar*>(str.data()), str.size());
     2572        internalData.initialize(reinterpret_cast<const DeprecatedChar*>(str.data()), str.size());
    25732573    }
    25742574}
    … …  
    25832583        dataHandle = allocateHandle();
    25842584        *dataHandle = &internalData;
    2585         internalData.initialize(reinterpret_cast<const QChar*>(str.data()), str.size());
     2585        internalData.initialize(reinterpret_cast<const DeprecatedChar*>(str.data()), str.size());
    25862586    }
    25872587}

  • trunk/WebCore/platform/DeprecatedString.h

    r14816 r15253  
    2424 */
    2525
    26 #ifndef QSTRING_H_
    27 #define QSTRING_H_
     26#ifndef DeprecatedString_h
     27#define DeprecatedString_h
    2828
    2929#include <ctype.h>
    … …  
    3232#include <CoreFoundation/CoreFoundation.h>
    3333#endif
    34 #include "KWQCString.h"
     34#include "DeprecatedCString.h"
    3535
    3636class RegularExpression;
    … …  
    4949}
    5050
    51 class QChar {
     51class DeprecatedChar {
    5252public:
    53     QChar();
    54     QChar(char);
    55     QChar(unsigned char);
    56     QChar(short);
    57     QChar(unsigned short);
    58     QChar(int);
    59     QChar(unsigned);
     53    DeprecatedChar();
     54    DeprecatedChar(char);
     55    DeprecatedChar(unsigned char);
     56    DeprecatedChar(short);
     57    DeprecatedChar(unsigned short);
     58    DeprecatedChar(int);
     59    DeprecatedChar(unsigned);
    6060
    6161    unsigned short unicode() const;
    6262    char latin1() const;
    6363    bool isSpace() const;
    64     QChar lower() const;
    65     QChar upper() const;
     64    DeprecatedChar lower() const;
     65    DeprecatedChar upper() const;
    6666
    6767private:
    … …  
    6969};
    7070
    71 inline QChar::QChar() : c(0)
    72 {
    73 }
    74 
    75 inline QChar::QChar(char ch) : c((unsigned char) ch)
    76 {
    77 }
    78 
    79 inline QChar::QChar(unsigned char uch) : c(uch)
    80 {
    81 }
    82 
    83 inline QChar::QChar(short n) : c(n)
    84 {
    85 }
    86 
    87 inline QChar::QChar(unsigned short n) : c(n)
    88 {
    89 }
    90 
    91 inline QChar::QChar(unsigned n) : c(n)
    92 {
    93 }
    94 
    95 inline QChar::QChar(int n) : c(n)
    96 {
    97 }
    98 
    99 inline unsigned short QChar::unicode() const
     71inline DeprecatedChar::DeprecatedChar() : c(0)
     72{
     73}
     74
     75inline DeprecatedChar::DeprecatedChar(char ch) : c((unsigned char) ch)
     76{
     77}
     78
     79inline DeprecatedChar::DeprecatedChar(unsigned char uch) : c(uch)
     80{
     81}
     82
     83inline DeprecatedChar::DeprecatedChar(short n) : c(n)
     84{
     85}
     86
     87inline DeprecatedChar::DeprecatedChar(unsigned short n) : c(n)
     88{
     89}
     90
     91inline DeprecatedChar::DeprecatedChar(unsigned n) : c(n)
     92{
     93}
     94
     95inline DeprecatedChar::DeprecatedChar(int n) : c(n)
     96{
     97}
     98
     99inline unsigned short DeprecatedChar::unicode() const
    100100{
    101101    return c;
    102102}
    103103
    104 inline bool QChar::isSpace() const
     104inline bool DeprecatedChar::isSpace() const
    105105{
    106106    // Use isspace() for basic Latin-1.
    … …  
    109109}
    110110
    111 inline QChar QChar::lower() const
     111inline DeprecatedChar DeprecatedChar::lower() const
    112112{
    113113    // FIXME: If fast enough, we should just call u_tolower directly.
    … …  
    115115}
    116116
    117 inline QChar QChar::upper() const
     117inline DeprecatedChar DeprecatedChar::upper() const
    118118{
    119119    // FIXME: If fast enough, we should just call u_toupper directly.
    … …  
    121121}
    122122
    123 inline char QChar::latin1() const
     123inline char DeprecatedChar::latin1() const
    124124{
    125125    return c > 0xff ? 0 : c;
    126126}
    127127
    128 inline bool operator==(QChar qc1, QChar qc2)
     128inline bool operator==(DeprecatedChar qc1, DeprecatedChar qc2)
    129129{
    130130    return qc1.unicode() == qc2.unicode();
    131131}
    132132
    133 inline bool operator==(QChar qc, char ch)
     133inline bool operator==(DeprecatedChar qc, char ch)
    134134{
    135135    return qc.unicode() == (unsigned char) ch;
    136136}
    137137
    138 inline bool operator==(char ch, QChar qc)
     138inline bool operator==(char ch, DeprecatedChar qc)
    139139{
    140140    return (unsigned char) ch == qc.unicode();
    141141}
    142142
    143 inline bool operator!=(QChar qc1, QChar qc2)
     143inline bool operator!=(DeprecatedChar qc1, DeprecatedChar qc2)
    144144{
    145145    return qc1.unicode() != qc2.unicode();
    146146}
    147147
    148 inline bool operator!=(QChar qc, char ch)
     148inline bool operator!=(DeprecatedChar qc, char ch)
    149149{
    150150    return qc.unicode() != (unsigned char) ch;
    151151}
    152152
    153 inline bool operator!=(char ch, QChar qc)
     153inline bool operator!=(char ch, DeprecatedChar qc)
    154154{
    155155    return (unsigned char) ch != qc.unicode();
    … …  
    159159// Will be rounded up to a multiple of 4, so we're stuck at 44.
    160160
    161 #define QS_INTERNAL_BUFFER_SIZE 20
    162 #define QS_INTERNAL_BUFFER_CHARS QS_INTERNAL_BUFFER_SIZE-1
    163 #define QS_INTERNAL_BUFFER_UCHARS QS_INTERNAL_BUFFER_SIZE/2
    164 
    165 struct KWQStringData 
     161#define WEBCORE_DS_INTERNAL_BUFFER_SIZE 20
     162#define WEBCORE_DS_INTERNAL_BUFFER_CHARS WEBCORE_DS_INTERNAL_BUFFER_SIZE-1
     163#define WEBCORE_DS_INTERNAL_BUFFER_UCHARS WEBCORE_DS_INTERNAL_BUFFER_SIZE/2
     164
     165struct DeprecatedStringData 
    166166{
    167167    // Uses shared null data.
    168     KWQStringData();
     168    DeprecatedStringData();
    169169    void initialize();
    170170   
    171171    // No copy.
    172     KWQStringData(QChar *u, unsigned l, unsigned m);
    173     void initialize(QChar *u, unsigned l, unsigned m);
     172    DeprecatedStringData(DeprecatedChar *u, unsigned l, unsigned m);
     173    void initialize(DeprecatedChar *u, unsigned l, unsigned m);
    174174   
    175175    // Copy bytes.
    176     KWQStringData(const QChar *u, unsigned l);
    177     void initialize(const QChar *u, unsigned l);
     176    DeprecatedStringData(const DeprecatedChar *u, unsigned l);
     177    void initialize(const DeprecatedChar *u, unsigned l);
    178178
    179179    // Copy bytes.
    180     KWQStringData(const char *u, unsigned l);
     180    DeprecatedStringData(const char *u, unsigned l);
    181181    void initialize(const char *u, unsigned l);
    182182
    183183    // Move from destination to source.
    184     KWQStringData(KWQStringData &);
    185 
    186     ~KWQStringData();
    187 
    188 #ifdef QSTRING_DEBUG_ALLOCATIONS
     184    DeprecatedStringData(DeprecatedStringData &);
     185
     186    ~DeprecatedStringData();
     187
     188#ifdef WEBCORE_DS_DEBUG_ALLOCATIONS
    189189    void* operator new(size_t s);
    190190    void operator delete(void*p);
    … …  
    198198    void increaseAsciiSize(unsigned size);
    199199
    200     QChar *unicode();
    201     QChar *makeUnicode();   
     200    DeprecatedChar *unicode();
     201    DeprecatedChar *makeUnicode();   
    202202    void increaseUnicodeSize(unsigned size);
    203203   
    … …  
    207207    unsigned refCount;
    208208    unsigned _length;
    209     mutable QChar *_unicode;
     209    mutable DeprecatedChar *_unicode;
    210210    mutable char *_ascii;
    211211    unsigned _maxUnicode : 30;
    … …  
    215215    bool _isAsciiValid : 1;
    216216   
    217     char _internalBuffer[QS_INTERNAL_BUFFER_SIZE]; // Pad out to a (((size + 1) & ~15) + 14) size
     217    char _internalBuffer[WEBCORE_DS_INTERNAL_BUFFER_SIZE]; // Pad out to a (((size + 1) & ~15) + 14) size
    218218
    219219private:
    220     KWQStringData(const KWQStringData &);
    221     KWQStringData &operator=(const KWQStringData &);
     220    DeprecatedStringData(const DeprecatedStringData &);
     221    DeprecatedStringData &operator=(const DeprecatedStringData &);
    222222};
    223223
    … …  
    227227
    228228    DeprecatedString();
    229     DeprecatedString(QChar);
    230     DeprecatedString(const QChar *, unsigned);
     229    DeprecatedString(DeprecatedChar);
     230    DeprecatedString(const DeprecatedChar *, unsigned);
    231231    DeprecatedString(const char *);
    232232    DeprecatedString(const char *, int len);
    … …  
    251251#endif
    252252    DeprecatedString &operator=(char);
    253     DeprecatedString &operator=(QChar);
     253    DeprecatedString &operator=(DeprecatedChar);
    254254    DeprecatedString &operator=(const char *);
    255255    DeprecatedString &operator=(const DeprecatedCString &);
    … …  
    257257    unsigned length() const;
    258258
    259     const QChar *unicode() const;
    260     const QChar *stableUnicode();
     259    const DeprecatedChar *unicode() const;
     260    const DeprecatedChar *stableUnicode();
    261261    const char *latin1() const;
    262262    const char *ascii() const;
    … …  
    271271    bool isEmpty() const;
    272272
    273     QChar at(unsigned) const;
     273    DeprecatedChar at(unsigned) const;
    274274
    275275    int compare(const DeprecatedString &) const;
    … …  
    281281
    282282    int find(char, int index = 0) const;
    283     int find(QChar, int index = 0) const;
     283    int find(DeprecatedChar, int index = 0) const;
    284284    int find(const char *, int index = 0, bool cs = true) const;
    285285    int find(const DeprecatedString &, int index = 0, bool cs = true) const;
    … …  
    293293    int contains(const char *, bool cs = true) const;
    294294    int contains(const DeprecatedString &, bool cs = true) const;
    295     int contains(QChar c, bool cs = true) const;
     295    int contains(DeprecatedChar c, bool cs = true) const;
    296296
    297297    bool endsWith(const DeprecatedString &) const;
    … …  
    319319    DeprecatedString simplifyWhiteSpace() const;
    320320
    321     DeprecatedString &setUnicode(const QChar *, unsigned);
     321    DeprecatedString &setUnicode(const DeprecatedChar *, unsigned);
    322322    DeprecatedString &setLatin1(const char *, int len=-1);
    323323
    … …  
    337337
    338338    DeprecatedString &append(const DeprecatedString &);
    339     DeprecatedString &append(QChar);
     339    DeprecatedString &append(DeprecatedChar);
    340340    DeprecatedString &append(char);
    341341    DeprecatedString &insert(unsigned, const DeprecatedString &);
    342     DeprecatedString &insert(unsigned, QChar);
     342    DeprecatedString &insert(unsigned, DeprecatedChar);
    343343    DeprecatedString &insert(unsigned, char);
    344344    DeprecatedString &insert(unsigned index, const char *insertChars, unsigned insertLength);
    345345    DeprecatedString &prepend(const DeprecatedString &);
    346346    DeprecatedString &remove(unsigned, unsigned);
    347     DeprecatedString &remove(const QChar &c) { return replace(DeprecatedString(c), ""); }
     347    DeprecatedString &remove(const DeprecatedChar &c) { return replace(DeprecatedString(c), ""); }
    348348    DeprecatedString &remove(const DeprecatedString &s) { return replace(s, ""); }
    349349    DeprecatedString &replace(unsigned index, unsigned len, const DeprecatedString &s);
    350350    DeprecatedString &replace(char, const DeprecatedString &);
    351     DeprecatedString &replace(QChar, const DeprecatedString &);
     351    DeprecatedString &replace(DeprecatedChar, const DeprecatedString &);
    352352    DeprecatedString &replace(const DeprecatedString &, const DeprecatedString &);
    353353    DeprecatedString &replace(const RegularExpression &, const DeprecatedString &);
    354     DeprecatedString &replace(QChar, QChar);
    355 
    356     DeprecatedString &append(const QChar *, unsigned length);
     354    DeprecatedString &replace(DeprecatedChar, DeprecatedChar);
     355
     356    DeprecatedString &append(const DeprecatedChar *, unsigned length);
    357357    DeprecatedString &append(const char *, unsigned length);
    358     DeprecatedString &insert(unsigned position, const QChar *, unsigned length);
    359     DeprecatedString &prepend(const QChar *, unsigned length);
    360    
    361     void fill(QChar, int len=-1);
     358    DeprecatedString &insert(unsigned position, const DeprecatedChar *, unsigned length);
     359    DeprecatedString &prepend(const DeprecatedChar *, unsigned length);
     360   
     361    void fill(DeprecatedChar, int len=-1);
    362362    void truncate(unsigned);
    363363
    … …  
    366366    bool operator!() const;
    367367
    368     const QChar operator[](int) const;
     368    const DeprecatedChar operator[](int) const;
    369369
    370370    DeprecatedString &operator+=(const DeprecatedString &s) { return append(s); }
    371     DeprecatedString &operator+=(QChar c) { return append(c); }
     371    DeprecatedString &operator+=(DeprecatedChar c) { return append(c); }
    372372    DeprecatedString &operator+=(char c) { return append(c); }
    373373
    … …  
    379379
    380380private:
    381     // Used by QConstString.
    382     DeprecatedString(KWQStringData *constData, bool /*dummy*/);
     381    // Used by DeprecatedConstString.
     382    DeprecatedString(DeprecatedStringData *constData, bool /*dummy*/);
    383383    void detach();
    384384    void detachAndDiscardCharacters();
    … …  
    386386    void detachInternal();
    387387    void deref();
    388     QChar *forceUnicode();
     388    DeprecatedChar *forceUnicode();
    389389    void setLength(unsigned);
    390390
    391     KWQStringData **dataHandle;
    392     KWQStringData internalData;
    393    
    394     static KWQStringData *shared_null;
    395     static KWQStringData *makeSharedNull();
    396     static KWQStringData **shared_null_handle;
    397     static KWQStringData **makeSharedNullHandle();
     391    DeprecatedStringData **dataHandle;
     392    DeprecatedStringData internalData;
     393   
     394    static DeprecatedStringData *shared_null;
     395    static DeprecatedStringData *makeSharedNull();
     396    static DeprecatedStringData **shared_null_handle;
     397    static DeprecatedStringData **makeSharedNullHandle();
    398398
    399399    friend bool operator==(const DeprecatedString &, const DeprecatedString &);
    400400    friend bool operator==(const DeprecatedString &, const char *);
    401401
    402     friend class QConstString;
     402    friend class DeprecatedConstString;
    403403    friend class QGDict;
    404     friend struct KWQStringData;
     404    friend struct DeprecatedStringData;
    405405};
    406406
    407407DeprecatedString operator+(const DeprecatedString &, const DeprecatedString &);
    408408DeprecatedString operator+(const DeprecatedString &, const char *);
    409 DeprecatedString operator+(const DeprecatedString &, QChar);
     409DeprecatedString operator+(const DeprecatedString &, DeprecatedChar);
    410410DeprecatedString operator+(const DeprecatedString &, char);
    411411DeprecatedString operator+(const char *, const DeprecatedString &);
    412 DeprecatedString operator+(QChar, const DeprecatedString &);
     412DeprecatedString operator+(DeprecatedChar, const DeprecatedString &);
    413413DeprecatedString operator+(char, const DeprecatedString &);
    414414
    415 inline char *KWQStringData::ascii()
     415inline char *DeprecatedStringData::ascii()
    416416{
    417417    return _isAsciiValid ? _ascii : makeAscii();
    418418}
    419419
    420 inline QChar *KWQStringData::unicode()
     420inline DeprecatedChar *DeprecatedStringData::unicode()
    421421{
    422422    return _isUnicodeValid ? _unicode : makeUnicode();
    … …  
    438438}
    439439
    440 inline const QChar *DeprecatedString::unicode() const
     440inline const DeprecatedChar *DeprecatedString::unicode() const
    441441{
    442442    return dataHandle[0]->unicode();
    … …  
    470470}
    471471
    472 inline const QChar DeprecatedString::operator[](int index) const
     472inline const DeprecatedChar DeprecatedString::operator[](int index) const
    473473{
    474474    return at(index);
    … …  
    555555}
    556556
    557 class QConstString : private DeprecatedString {
     557class DeprecatedConstString : private DeprecatedString {
    558558public:
    559     QConstString(const QChar *, unsigned);
    560     ~QConstString();
     559    DeprecatedConstString(const DeprecatedChar *, unsigned);
     560    ~DeprecatedConstString();
    561561    const DeprecatedString &string() const { return *this; }
    562562};

  • trunk/WebCore/platform/DeprecatedStringList.cpp

    r13393 r15253  
    4444}
    4545 
    46 DeprecatedStringList DeprecatedStringList::split(const QChar &separator, const DeprecatedString &s, bool allowEmptyEntries)
     46DeprecatedStringList DeprecatedStringList::split(const DeprecatedChar &separator, const DeprecatedString &s, bool allowEmptyEntries)
    4747{
    4848    return DeprecatedStringList::split(DeprecatedString(separator), s, allowEmptyEntries);

  • trunk/WebCore/platform/DeprecatedStringList.h

    r13393 r15253  
    2424 */
    2525
    26 #ifndef QSTRINGLIST_H_
    27 #define QSTRINGLIST_H_
     26#ifndef DeprecatedStringList_h
     27#define DeprecatedStringList_h
    2828
    2929#include "DeprecatedString.h"
    … …  
    4141public:
    4242    static DeprecatedStringList split(const DeprecatedString &, const DeprecatedString &, bool allowEmptyEntries = false);
    43     static DeprecatedStringList split(const QChar &, const DeprecatedString &, bool allowEmptyEntries = false);
     43    static DeprecatedStringList split(const DeprecatedChar &, const DeprecatedString &, bool allowEmptyEntries = false);
    4444
    4545    DeprecatedString join(const DeprecatedString &) const;

  • trunk/WebCore/platform/DeprecatedValueList.h

    r14407 r15253  
    2424 */
    2525
    26 #ifndef QVALUELIST_H_
    27 #define QVALUELIST_H_
     26#ifndef DeprecatedValueList_h
     27#define DeprecatedValueList_h
    2828
    2929#include "DeprecatedValueListImpl.h"

  • trunk/WebCore/platform/DeprecatedValueListImpl.cpp

    r13852 r15253  
    3030#include <stdlib.h>
    3131
    32 class DeprecatedValueListImpl::KWQValueListPrivate : public Shared<DeprecatedValueListImpl::KWQValueListPrivate>
     32class DeprecatedValueListImpl::Private : public Shared<DeprecatedValueListImpl::Private>
    3333{
    3434public:
    35     KWQValueListPrivate(void (*deleteFunc)(DeprecatedValueListImplNode *), DeprecatedValueListImplNode *(*copyFunc)(DeprecatedValueListImplNode *));
    36     KWQValueListPrivate(const KWQValueListPrivate &other);
    37 
    38     ~KWQValueListPrivate();
     35    Private(void (*deleteFunc)(DeprecatedValueListImplNode *), DeprecatedValueListImplNode *(*copyFunc)(DeprecatedValueListImplNode *));
     36    Private(const Private &other);
     37
     38    ~Private();
    3939
    4040    void copyList(DeprecatedValueListImplNode *l, DeprecatedValueListImplNode *&head, DeprecatedValueListImplNode *&tail) const;
    … …  
    4949};
    5050
    51 inline DeprecatedValueListImpl::KWQValueListPrivate::KWQValueListPrivate(void (*deleteFunc)(DeprecatedValueListImplNode*),
     51inline DeprecatedValueListImpl::Private::Private(void (*deleteFunc)(DeprecatedValueListImplNode*),
    5252        DeprecatedValueListImplNode* (*copyFunc)(DeprecatedValueListImplNode*)) :
    5353    head(NULL),
    … …  
    5959}
    6060
    61 inline DeprecatedValueListImpl::KWQValueListPrivate::KWQValueListPrivate(const KWQValueListPrivate &other) :
    62     Shared<DeprecatedValueListImpl::KWQValueListPrivate>(),
     61inline DeprecatedValueListImpl::Private::Private(const Private &other) :
     62    Shared<DeprecatedValueListImpl::Private>(),
    6363    deleteNode(other.deleteNode),
    6464    copyNode(other.copyNode),
    … …  
    6868}
    6969
    70 inline DeprecatedValueListImpl::KWQValueListPrivate::~KWQValueListPrivate()
     70inline DeprecatedValueListImpl::Private::~Private()
    7171{
    7272    deleteList(head);
    7373}
    7474
    75 void DeprecatedValueListImpl::KWQValueListPrivate::copyList(DeprecatedValueListImplNode *l, DeprecatedValueListImplNode *&head, DeprecatedValueListImplNode *&tail) const
     75void DeprecatedValueListImpl::Private::copyList(DeprecatedValueListImplNode *l, DeprecatedValueListImplNode *&head, DeprecatedValueListImplNode *&tail) const
    7676{
    7777    DeprecatedValueListImplNode *prev = NULL;
    … …  
    9898}
    9999
    100 void DeprecatedValueListImpl::KWQValueListPrivate::deleteList(DeprecatedValueListImplNode *l)
     100void DeprecatedValueListImpl::Private::deleteList(DeprecatedValueListImplNode *l)
    101101{
    102102    DeprecatedValueListImplNode *p = l;
    … …  
    110110
    111111DeprecatedValueListImpl::DeprecatedValueListImpl(void (*deleteFunc)(DeprecatedValueListImplNode *), DeprecatedValueListImplNode *(*copyFunc)(DeprecatedValueListImplNode *)) :
    112     d(new KWQValueListPrivate(deleteFunc, copyFunc))
     112    d(new Private(deleteFunc, copyFunc))
    113113{
    114114}
    … …  
    378378{
    379379    DeprecatedValueListImpl tmp(other);
    380     RefPtr<KWQValueListPrivate> tmpD = tmp.d;
     380    RefPtr<Private> tmpD = tmp.d;
    381381
    382382    tmp.d = d;
    … …  
    389389{
    390390    if (!d->hasOneRef())
    391         d = new KWQValueListPrivate(*d);
     391        d = new Private(*d);
    392392}
    393393

  • trunk/WebCore/platform/DeprecatedValueListImpl.h

    r14256 r15253  
    2424 */
    2525
    26 #ifndef KWQVALUELIST_H_
    27 #define KWQVALUELIST_H_
     26#ifndef DeprecatedValueListImpl_h
     27#define DeprecatedValueListImpl_h
    2828
    2929#include <wtf/RefPtr.h>
    … …  
    9999    void copyOnWrite();
    100100
    101     class KWQValueListPrivate;
     101    class Private;
    102102
    103     RefPtr<KWQValueListPrivate> d;
     103    RefPtr<Private> d;
    104104   
    105105    friend class DeprecatedValueListImplNode;
    … …  
    117117    friend class DeprecatedValueListImpl;
    118118    friend class DeprecatedValueListImplIterator;
    119     friend class DeprecatedValueListImpl::KWQValueListPrivate;
     119    friend class DeprecatedValueListImpl::Private;
    120120};
    121121

  • trunk/WebCore/platform/FloatSize.h

    r14520 r15253  
    2525 */
    2626
    27 #ifndef QSIZEF_H_
    28 #define QSIZEF_H_
     27#ifndef FloatSize_h
     28#define FloatSize_h
    2929
    3030#if __APPLE__

  • trunk/WebCore/platform/Font.cpp

    r14541 r15253  
    3030#include "FontFallbackList.h"
    3131#include "GraphicsContext.h"
    32 #include "KWQKHTMLSettings.h"
     32#include "Settings.h"
    3333
    3434#include "GlyphBuffer.h"

  • trunk/WebCore/platform/KURL.cpp

    r15010 r15253  
    12481248        return s;
    12491249    }
    1250     return DeprecatedString(reinterpret_cast<QChar *>(buffer), numCharactersConverted);
     1250    return DeprecatedString(reinterpret_cast<DeprecatedChar *>(buffer), numCharactersConverted);
    12511251}
    12521252
    … …  
    12661266            return a;
    12671267        }
    1268         QChar c = s[hostnameOrStringStart];
     1268        DeprecatedChar c = s[hostnameOrStringStart];
    12691269        p = hostnameOrStringStart + 1;
    12701270

  • trunk/WebCore/platform/RegularExpression.cpp

    r13867 r15253  
    3535#define MAX_OFFSETS     (3 *MAX_SUBSTRINGS)
    3636
    37 class RegularExpression::KWQRegExpPrivate : public Shared<RegularExpression::KWQRegExpPrivate>
     37class RegularExpression::Private : public Shared<RegularExpression::Private>
    3838{
    3939public:
    40     KWQRegExpPrivate();
    41     KWQRegExpPrivate(DeprecatedString pattern, bool caseSensitive, bool glob);
    42     ~KWQRegExpPrivate();
     40    Private();
     41    Private(DeprecatedString pattern, bool caseSensitive, bool glob);
     42    ~Private();
    4343
    4444    void compile(bool caseSensitive, bool glob);
    … …  
    5454};
    5555
    56 RegularExpression::KWQRegExpPrivate::KWQRegExpPrivate() : pattern("")
     56RegularExpression::Private::Private() : pattern("")
    5757{
    5858    compile(true, false);
    5959}
    6060
    61 RegularExpression::KWQRegExpPrivate::KWQRegExpPrivate(DeprecatedString p, bool caseSensitive, bool glob) : pattern(p), lastMatchPos(-1), lastMatchLength(-1)
     61RegularExpression::Private::Private(DeprecatedString p, bool caseSensitive, bool glob) : pattern(p), lastMatchPos(-1), lastMatchLength(-1)
    6262{
    6363    compile(caseSensitive, glob);
    … …  
    8787}
    8888
    89 void RegularExpression::KWQRegExpPrivate::compile(bool caseSensitive, bool glob)
     89void RegularExpression::Private::compile(bool caseSensitive, bool glob)
    9090{
    9191    DeprecatedString p;
    … …  
    110110}
    111111
    112 RegularExpression::KWQRegExpPrivate::~KWQRegExpPrivate()
     112RegularExpression::Private::~Private()
    113113{
    114114    pcre_free(regex);
    … …  
    116116
    117117
    118 RegularExpression::RegularExpression() : d(new RegularExpression::KWQRegExpPrivate())
    119 {
    120 }
    121 
    122 RegularExpression::RegularExpression(const DeprecatedString &pattern, bool caseSensitive, bool glob) : d(new RegularExpression::KWQRegExpPrivate(pattern, caseSensitive, glob))
    123 {
    124 }
    125 
    126 RegularExpression::RegularExpression(const char *cpattern) : d(new RegularExpression::KWQRegExpPrivate(cpattern, true, false))
     118RegularExpression::RegularExpression() : d(new RegularExpression::Private())
     119{
     120}
     121
     122RegularExpression::RegularExpression(const DeprecatedString &pattern, bool caseSensitive, bool glob) : d(new RegularExpression::Private(pattern, caseSensitive, glob))
     123{
     124}
     125
     126RegularExpression::RegularExpression(const char *cpattern) : d(new RegularExpression::Private(cpattern, true, false))
    127127{
    128128}
    … …  
    140140{
    141141    RegularExpression tmp(re);
    142     RefPtr<RegularExpression::KWQRegExpPrivate> tmpD = tmp.d;
     142    RefPtr<RegularExpression::Private> tmpD = tmp.d;
    143143   
    144144    tmp.d = d;
    … …  
    225225    int substringLength = pcre_get_substring(reinterpret_cast<const uint16_t *>(d->lastMatchString.unicode()), d->lastMatchOffsets, d->lastMatchCount, n, &substring);
    226226    if (substringLength > 0) {
    227        DeprecatedString capture(reinterpret_cast<const QChar *>(substring), substringLength);
     227       DeprecatedString capture(reinterpret_cast<const DeprecatedChar *>(substring), substringLength);
    228228       pcre_free_substring(substring);
    229229       return capture;

  • trunk/WebCore/platform/RegularExpression.h

    r13867 r15253  
    2424 */
    2525
    26 #ifndef QREGEXP_H_
    27 #define QREGEXP_H_
     26#ifndef RegularExpression_h
     27#define RegularExpression_h
    2828
    2929#include "DeprecatedString.h"
    … …  
    5151   
    5252private:
    53     class KWQRegExpPrivate;   
    54     RefPtr<KWQRegExpPrivate> d;
     53    class Private;   
     54    RefPtr<Private> d;
    5555};
    5656

  • trunk/WebCore/platform/SegmentedString.h

    r14273 r15253  
    5252                str.append(m_string);
    5353        } else {
    54             str.insert(str.length(), reinterpret_cast<const QChar*>(m_current), m_length);
     54            str.insert(str.length(), reinterpret_cast<const DeprecatedChar*>(m_current), m_length);
    5555        }
    5656    }

  • trunk/WebCore/platform/StreamingTextDecoder.cpp

    r14911 r15253  
    7979
    8080        if (c)
    81             result.append(reinterpret_cast<QChar*>(&c), 1);
     81            result.append(reinterpret_cast<DeprecatedChar*>(&c), 1);
    8282
    8383        m_numBufferedBytes = 0;
    … …  
    105105            }
    106106        }
    107         result.append(reinterpret_cast<QChar*>(buffer), bufferLength);
     107        result.append(reinterpret_cast<DeprecatedChar*>(buffer), bufferLength);
    108108        len -= runLength * 2;
    109109    }
    … …  
    139139        if (ored & 0x80)
    140140            return false;
    141         result.append(reinterpret_cast<QChar*>(buffer), bufferLength);
     141        result.append(reinterpret_cast<DeprecatedChar*>(buffer), bufferLength);
    142142        len -= runLength;
    143143    }
    … …  
    189189        if (BOM == characters[i]) {
    190190            if (start != i)
    191                 s.append(reinterpret_cast<const QChar*>(&characters[start]), i - start);
     191                s.append(reinterpret_cast<const DeprecatedChar*>(&characters[start]), i - start);
    192192            start = i + 1;
    193193        }
    194194    }
    195195    if (start != characterCount)
    196         s.append(reinterpret_cast<const QChar*>(&characters[start]), characterCount - start);
     196        s.append(reinterpret_cast<const DeprecatedChar*>(&characters[start]), characterCount - start);
    197197}
    198198

  • trunk/WebCore/platform/String.cpp

    r14989 r15253  
    225225       return false;
    226226
    227     result = QConstString(reinterpret_cast<const QChar*>(m_impl->characters()), m_impl->length() - 1).string().toInt();
     227    result = DeprecatedConstString(reinterpret_cast<const DeprecatedChar*>(m_impl->characters()), m_impl->length() - 1).string().toInt();
    228228    return true;
    229229}
    … …  
    242242    if (!m_impl->characters())
    243243        return DeprecatedString("", 0);
    244     return DeprecatedString(reinterpret_cast<const QChar*>(m_impl->characters()), m_impl->length());
     244    return DeprecatedString(reinterpret_cast<const DeprecatedChar*>(m_impl->characters()), m_impl->length());
    245245}
    246246

  • trunk/WebCore/platform/StringImpl.cpp

    r14831 r15253  
    253253
    254254    unsigned i = 0;
    255     while (i < m_length && QChar(m_data[i]).isSpace())
     255    while (i < m_length && DeprecatedChar(m_data[i]).isSpace())
    256256        ++i;
    257257    if (i < m_length && (m_data[i] == '+' || m_data[i] == '-'))
    … …  
    261261
    262262    bool ok;
    263     int r = QConstString(reinterpret_cast<const QChar*>(m_data), i).string().toInt(&ok);
     263    int r = DeprecatedConstString(reinterpret_cast<const DeprecatedChar*>(m_data), i).string().toInt(&ok);
    264264
    265265    /* Skip over any remaining digits, we are not that accurate (5.5% => 5%) */
    … …  
    268268
    269269    /* IE Quirk: Skip any whitespace (20 % => 20%) */
    270     while (i < m_length && QChar(m_data[i]).isSpace())
     270    while (i < m_length && DeprecatedChar(m_data[i]).isSpace())
    271271        ++i;
    272272
    … …  
    307307            spacified[i] = cc;
    308308    }
    309     DeprecatedString str(reinterpret_cast<const QChar*>(spacified), m_length);
     309    DeprecatedString str(reinterpret_cast<const DeprecatedChar*>(spacified), m_length);
    310310    deleteUCharVector(spacified);
    311311
    … …  
    334334        return 0;
    335335    }
    336     DeprecatedString str(reinterpret_cast<const QChar*>(m_data), m_length);
     336    DeprecatedString str(reinterpret_cast<const DeprecatedChar*>(m_data), m_length);
    337337    str = str.simplifyWhiteSpace();
    338338
    … …  
    529529    // Allow leading spaces.
    530530    for (; i != m_length; ++i)
    531         if (!QChar(m_data[i]).isSpace())
     531        if (!DeprecatedChar(m_data[i]).isSpace())
    532532            break;
    533533   
    … …  
    541541            break;
    542542   
    543     return QConstString(reinterpret_cast<const QChar*>(m_data), i).string().toInt(ok);
     543    return DeprecatedConstString(reinterpret_cast<const DeprecatedChar*>(m_data), i).string().toInt(ok);
    544544}
    545545

  • trunk/WebCore/platform/TextEncoding.cpp

    r14816 r15253  
    143143        normalizedString.truncate(copy.length()); // normalization to NFC rarely increases the length, so this first attempt will usually succeed
    144144       
    145         int32_t normalizedLength = unorm_normalize(source, copy.length(), UNORM_NFC, 0, reinterpret_cast<UChar*>(const_cast<QChar*>(normalizedString.unicode())), copy.length(), &err);
     145        int32_t normalizedLength = unorm_normalize(source, copy.length(), UNORM_NFC, 0, reinterpret_cast<UChar*>(const_cast<DeprecatedChar*>(normalizedString.unicode())), copy.length(), &err);
    146146        if (err == U_BUFFER_OVERFLOW_ERROR) {
    147147            err = U_ZERO_ERROR;
    148148            normalizedString.truncate(normalizedLength);
    149             normalizedLength = unorm_normalize(source, copy.length(), UNORM_NFC, 0, reinterpret_cast<UChar*>(const_cast<QChar*>(normalizedString.unicode())), normalizedLength, &err);
     149            normalizedLength = unorm_normalize(source, copy.length(), UNORM_NFC, 0, reinterpret_cast<UChar*>(const_cast<DeprecatedChar*>(normalizedString.unicode())), normalizedLength, &err);
    150150        }
    151151       

  • trunk/WebCore/platform/TransferJob.cpp

    r13821 r15253  
    2828#include "TransferJobInternal.h"
    2929
    30 #include "KWQLoader.h"
     30#include "LoaderFunctions.h"
    3131#include "Logging.h"
    3232

  • trunk/WebCore/platform/TransferJob.h

    r14807 r15253  
    4646#if __APPLE__
    4747#ifdef __OBJC__
    48 @class KWQResourceLoader;
     48@class WebCoreResourceLoaderImp;
    4949#else
    50 class KWQResourceLoader;
     50class WebCoreResourceLoaderImp;
    5151#endif
    5252#endif
    … …  
    8282
    8383#if __APPLE__
    84     void setLoader(KWQResourceLoader*);
     84    void setLoader(WebCoreResourceLoaderImp*);
    8585#endif
    8686#if WIN32

  • trunk/WebCore/platform/TransferJobInternal.h

    r14807 r15253  
    4242// The allocations and releases in TransferJobInternal are
    4343// Cocoa-exception-free (either simple Foundation classes or
    44 // KWQResourceLoader which avoids doing work in dealloc).
     44// WebCoreResourceLoaderImp which avoids doing work in dealloc).
    4545
    4646namespace WebCore {
    … …  
    123123       
    124124#if __APPLE__
    125         KWQResourceLoader* loader;
     125        WebCoreResourceLoaderImp* loader;
    126126        NSURLResponse* response;
    127127#endif

  • trunk/WebCore/platform/gdk/FrameGdk.cpp

    r15124 r15253  
    3838#include "BrowserExtensionGdk.h"
    3939#include "Document.h"
    40 #include "KWQKHTMLSettings.h"
     40#include "Settings.h"
    4141#include "Plugin.h"
    4242#include "FramePrivate.h"
    … …  
    5050#include "SelectionController.h"
    5151#include "TypingCommand.h"
    52 #include "KWQKSSLKeyGen.h"
     52#include "SSLKeyGenerator.h"
    5353#include "KeyboardCodes.h"
    5454#include <gdk/gdk.h>
    5555
    56 DeprecatedStringList KSSLKeyGen::supportedKeySizes(){return DeprecatedStringList();};
    57 DeprecatedString KSSLKeyGen::signedPublicKeyAndChallengeString(unsigned keySizeIndex, const DeprecatedString &challengeString, const KURL &url){return DeprecatedString();};
     56DeprecatedStringList SSLKeyGenerator::supportedKeySizes(){return DeprecatedStringList();};
     57DeprecatedString SSLKeyGenerator::signedPublicKeyAndChallengeString(unsigned keySizeIndex, const DeprecatedString &challengeString, const KURL &url){return DeprecatedString();};
    5858
    5959// This function loads resources from WebKit
    … …  
    8282    //broken since it calls scroll on scrollbars
    8383    //and we have none now
    84     //r->scroll(direction, KWQScrollWheel, multiplier);
     84    //r->scroll(direction, ScrollByWheel, multiplier);
    8585    if (!r->layer())
    8686        return;
    … …  
    103103{
    104104    d->m_extension = new BrowserExtensionGdk(this);
    105     KHTMLSettings* settings = new KHTMLSettings;
     105    Settings* settings = new Settings;
    106106    settings->setAutoLoadImages(true);
    107107    settings->setMinFontSize(5);
    … …  
    128128{
    129129    d->m_extension = new BrowserExtensionGdk(this);
    130     KHTMLSettings* settings = new KHTMLSettings;
     130    Settings* settings = new Settings;
    131131    settings->setAutoLoadImages(true);
    132132    setSettings(settings);

  • trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp

    r15135 r15253  
    3333#include <stdlib.h>
    3434#include "Node.h"
    35 #include "KWQLineEdit.h"
     35#include "TextField.h"
    3636#include "Font.h"
    37 #include "KWQFileButton.h"
    38 #include "KWQTextEdit.h"
    39 #include "KWQComboBox.h"
     37#include "FileButton.h"
     38#include "TextBox.h"
     39#include "PopUpButton.h"
    4040#include "IntPoint.h"
    4141#include "Widget.h"
    4242#include "GraphicsContext.h"
    43 #include "KWQSlider.h"
     43#include "WebCoreSlider.h"
    4444#include "Cursor.h"
    4545#include "loader.h"
    4646#include "FrameView.h"
    4747#include "KURL.h"
    48 #include "KWQScrollBar.h"
     48#include "WebCoreScrollBar.h"
    4949#include "JavaAppletWidget.h"
    50 #include "KWQScrollBar.h"
     50#include "WebCoreScrollBar.h"
    5151#include "Path.h"
    5252#include "PlatformMouseEvent.h"
    … …  
    7373//bool FrameView::isFrameView() const { notImplemented(); return 0; }
    7474
    75 QTextEdit::QTextEdit(Widget*) { notImplemented(); }
    76 QTextEdit::~QTextEdit() { notImplemented(); }
    77 String QTextEdit::textWithHardLineBreaks() const { notImplemented(); return String(); }
    78 IntSize QTextEdit::sizeWithColumnsAndRows(int, int) const { notImplemented(); return IntSize(); }
    79 void QTextEdit::setText(String const&) { notImplemented(); }
    80 void QTextEdit::setColors(Color const&, Color const&) { notImplemented(); }
    81 void QTextEdit::setFont(WebCore::Font const&) { notImplemented(); }
    82 void QTextEdit::setWritingDirection(enum WebCore::TextDirection) { notImplemented(); }
    83 bool QTextEdit::checksDescendantsForFocus() const { notImplemented(); return false; }
    84 int QTextEdit::selectionStart() { notImplemented(); return 0; }
    85 bool QTextEdit::hasSelectedText() const { notImplemented(); return 0; }
    86 int QTextEdit::selectionEnd() { notImplemented(); return 0; }
    87 void QTextEdit::setScrollBarModes(ScrollBarMode, ScrollBarMode) { notImplemented(); }
    88 void QTextEdit::setReadOnly(bool) { notImplemented(); }
    89 void QTextEdit::selectAll() { notImplemented(); }
    90 void QTextEdit::setDisabled(bool) { notImplemented(); }
    91 void QTextEdit::setLineHeight(int) { notImplemented(); }
    92 void QTextEdit::setSelectionStart(int) { notImplemented(); }
    93 void QTextEdit::setCursorPosition(int, int) { notImplemented(); }
    94 String QTextEdit::text() const { notImplemented(); return String(); }
    95 void QTextEdit::setWordWrap(QTextEdit::WrapStyle) { notImplemented(); }
    96 void QTextEdit::setAlignment(HorizontalAlignment) { notImplemented(); }
    97 void QTextEdit::setSelectionEnd(int) { notImplemented(); }
    98 void QTextEdit::getCursorPosition(int*, int*) const { notImplemented(); }
    99 void QTextEdit::setSelectionRange(int, int) { notImplemented(); }
    100 
    101 Widget::FocusPolicy QComboBox::focusPolicy() const { notImplemented(); return NoFocus; }
    102 void QComboBox::populate() { notImplemented(); }
     75TextBox::TextBox(Widget*) { notImplemented(); }
     76TextBox::~TextBox() { notImplemented(); }
     77String TextBox::textWithHardLineBreaks() const { notImplemented(); return String(); }
     78IntSize TextBox::sizeWithColumnsAndRows(int, int) const { notImplemented(); return IntSize(); }
     79void TextBox::setText(String const&) { notImplemented(); }
     80void TextBox::setColors(Color const&, Color const&) { notImplemented(); }
     81void TextBox::setFont(WebCore::Font const&) { notImplemented(); }
     82void TextBox::setWritingDirection(enum WebCore::TextDirection) { notImplemented(); }
     83bool TextBox::checksDescendantsForFocus() const { notImplemented(); return false; }
     84int TextBox::selectionStart() { notImplemented(); return 0; }
     85bool TextBox::hasSelectedText() const { notImplemented(); return 0; }
     86int TextBox::selectionEnd() { notImplemented(); return 0; }
     87void TextBox::setScrollBarModes(ScrollBarMode, ScrollBarMode) { notImplemented(); }
     88void TextBox::setReadOnly(bool) { notImplemented(); }
     89void TextBox::selectAll() { notImplemented(); }
     90void TextBox::setDisabled(bool) { notImplemented(); }
     91void TextBox::setLineHeight(int) { notImplemented(); }
     92void TextBox::setSelectionStart(int) { notImplemented(); }
     93void TextBox::setCursorPosition(int, int) { notImplemented(); }
     94String TextBox::text() const { notImplemented(); return String(); }
     95void TextBox::setWordWrap(TextBox::WrapStyle) { notImplemented(); }
     96void TextBox::setAlignment(HorizontalAlignment) { notImplemented(); }
     97void TextBox::setSelectionEnd(int) { notImplemented(); }
     98void TextBox::getCursorPosition(int*, int*) const { notImplemented(); }
     99void TextBox::setSelectionRange(int, int) { notImplemented(); }
     100
     101Widget::FocusPolicy PopUpButton::focusPolicy() const { notImplemented(); return NoFocus; }
     102void PopUpButton::populate() { notImplemented(); }
    103103
    104104void Widget::enableFlushDrawing() { notImplemented(); }
    … …  
    111111JavaAppletWidget::JavaAppletWidget(IntSize const&, Element*, WTF::HashMap<String, String> const&) { notImplemented(); }
    112112
    113 void QLineEdit::selectAll() { notImplemented(); }
    114 void QLineEdit::addSearchResult() { notImplemented(); }
    115 int QLineEdit::selectionStart() const { notImplemented(); return 0; }
    116 bool QLineEdit::hasSelectedText() const { notImplemented(); return 0; }
    117 String QLineEdit::selectedText() const { notImplemented(); return String(); }
    118 void QLineEdit::setAutoSaveName(String const&) { notImplemented(); }
    119 bool QLineEdit::checksDescendantsForFocus() const { notImplemented(); return false; }
    120 void QLineEdit::setSelection(int, int) { notImplemented(); }
    121 void QLineEdit::setMaxResults(int) { notImplemented(); }
    122 bool QLineEdit::edited() const { notImplemented(); return 0; }
    123 
    124 QSlider::QSlider() { notImplemented(); }
    125 IntSize QSlider::sizeHint() const { notImplemented(); return IntSize(); }
    126 void QSlider::setValue(double) { notImplemented(); }
    127 void QSlider::setMaxValue(double) { notImplemented(); }
    128 void QSlider::setMinValue(double) { notImplemented(); }
    129 QSlider::~QSlider() { notImplemented(); }
    130 void QSlider::setFont(WebCore::Font const&) { notImplemented(); }
    131 double QSlider::value() const { notImplemented(); return 0; }
    132 
    133 void QListBox::setSelected(int, bool) { notImplemented(); }
    134 IntSize QListBox::sizeForNumberOfLines(int) const { notImplemented(); return IntSize(); }
    135 bool QListBox::isSelected(int) const { notImplemented(); return 0; }
    136 void QListBox::appendItem(DeprecatedString const&, KWQListBoxItemType, bool) { notImplemented(); }
    137 void QListBox::doneAppendingItems() { notImplemented(); }
    138 void QListBox::setWritingDirection(TextDirection) { notImplemented(); }
    139 void QListBox::setEnabled(bool) { notImplemented(); }
    140 void QListBox::clear() { notImplemented(); }
    141 bool QListBox::checksDescendantsForFocus() const { notImplemented(); return 0; }
    142 
    143 KWQFileButton::KWQFileButton(Frame*) { notImplemented(); }
    144 void KWQFileButton::click(bool) { notImplemented(); }
    145 IntSize KWQFileButton::sizeForCharacterWidth(int) const { notImplemented(); return IntSize(); }
    146 Widget::FocusPolicy KWQFileButton::focusPolicy() const { notImplemented(); return NoFocus; }
    147 WebCore::IntRect KWQFileButton::frameGeometry() const { notImplemented(); return IntRect(); }
    148 void KWQFileButton::setFilename(DeprecatedString const&) { notImplemented(); }
    149 int KWQFileButton::baselinePosition(int) const { notImplemented(); return 0; }
    150 void KWQFileButton::setFrameGeometry(WebCore::IntRect const&) { notImplemented(); }
    151 void KWQFileButton::setDisabled(bool) { notImplemented(); }
    152 
    153 Widget::FocusPolicy QTextEdit::focusPolicy() const { notImplemented(); return NoFocus; }
    154 Widget::FocusPolicy QSlider::focusPolicy() const { notImplemented(); return NoFocus; }
    155 Widget::FocusPolicy QListBox::focusPolicy() const { notImplemented(); return NoFocus; }
    156 Widget::FocusPolicy QLineEdit::focusPolicy() const { notImplemented(); return NoFocus; }
     113void TextField::selectAll() { notImplemented(); }
     114void TextField::addSearchResult() { notImplemented(); }
     115int TextField::selectionStart() const { notImplemented(); return 0; }
     116bool TextField::hasSelectedText() const { notImplemented(); return 0; }
     117String TextField::selectedText() const { notImplemented(); return String(); }
     118void TextField::setAutoSaveName(String const&) { notImplemented(); }
     119bool TextField::checksDescendantsForFocus() const { notImplemented(); return false; }
     120void TextField::setSelection(int, int) { notImplemented(); }
     121void TextField::setMaxResults(int) { notImplemented(); }
     122bool TextField::edited() const { notImplemented(); return 0; }
     123
     124Slider::Slider() { notImplemented(); }
     125IntSize Slider::sizeHint() const { notImplemented(); return IntSize(); }
     126void Slider::setValue(double) { notImplemented(); }
     127void Slider::setMaxValue(double) { notImplemented(); }
     128void Slider::setMinValue(double) { notImplemented(); }
     129Slider::~Slider() { notImplemented(); }
     130void Slider::setFont(WebCore::Font const&) { notImplemented(); }
     131double Slider::value() const { notImplemented(); return 0; }
     132
     133void ListBox::setSelected(int, bool) { notImplemented(); }
     134IntSize ListBox::sizeForNumberOfLines(int) const { notImplemented(); return IntSize(); }
     135bool ListBox::isSelected(int) const { notImplemented(); return 0; }
     136void ListBox::appendItem(DeprecatedString const&, ListBoxItemType, bool) { notImplemented(); }
     137void ListBox::doneAppendingItems() { notImplemented(); }
     138void ListBox::setWritingDirection(TextDirection) { notImplemented(); }
     139void ListBox::setEnabled(bool) { notImplemented(); }
     140void ListBox::clear() { notImplemented(); }
     141bool ListBox::checksDescendantsForFocus() const { notImplemented(); return 0; }
     142
     143FileButton::FileButton(Frame*) { notImplemented(); }
     144void FileButton::click(bool) { notImplemented(); }
     145IntSize FileButton::sizeForCharacterWidth(int) const { notImplemented(); return IntSize(); }
     146Widget::FocusPolicy FileButton::focusPolicy() const { notImplemented(); return NoFocus; }
     147WebCore::IntRect FileButton::frameGeometry() const { notImplemented(); return IntRect(); }
     148void FileButton::setFilename(DeprecatedString const&) { notImplemented(); }
     149int FileButton::baselinePosition(int) const { notImplemented(); return 0; }
     150void FileButton::setFrameGeometry(WebCore::IntRect const&) { notImplemented(); }
     151void FileButton::setDisabled(bool) { notImplemented(); }
     152
     153Widget::FocusPolicy TextBox::focusPolicy() const { notImplemented(); return NoFocus; }
     154Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; }
     155Widget::FocusPolicy ListBox::focusPolicy() const { notImplemented(); return NoFocus; }
     156Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; }
    157157
    158158Cursor::Cursor(Image*) { notImplemented(); }
    … …  
    165165int WebCore::findNextWordFromIndex(UChar const*, int, int, bool) { notImplemented(); return 0; }
    166166
    167 DeprecatedArray<char> KWQServeSynchronousRequest(Loader*, DocLoader*, TransferJob*, KURL&, DeprecatedString&) { notImplemented(); return 0; }
     167DeprecatedArray<char> ServeSynchronousRequest(Loader*, DocLoader*, TransferJob*, KURL&, DeprecatedString&) { notImplemented(); return 0; }
    168168
    169169void FrameGdk::focusWindow() { notImplemented(); }
    … …  
    261261int BrowserExtensionGdk::getHistoryLength() { return 0; }
    262262
    263 bool KWQCheckIfReloading(WebCore::DocLoader*) { return false; }
    264 void KWQCheckCacheObjectStatus(DocLoader*, CachedObject*) { }
     263bool CheckIfReloading(WebCore::DocLoader*) { return false; }
     264void CheckCacheObjectStatus(DocLoader*, CachedObject*) { }
    265265
    266266void Widget::setEnabled(bool) { }
    … …  
    313313void Path::addEllipse(const FloatRect&) { }
    314314
    315 QLineEdit::QLineEdit(QLineEdit::Type) { }
    316 QLineEdit::~QLineEdit() { }
    317 void QLineEdit::setFont(WebCore::Font const&) { }
    318 void QLineEdit::setAlignment(HorizontalAlignment) { }
    319 void QLineEdit::setWritingDirection(TextDirection) { }
    320 int QLineEdit::maxLength() const { return 0; }
    321 void QLineEdit::setMaxLength(int) { }
    322 String QLineEdit::text() const { return String(); }
    323 void QLineEdit::setText(String const&) { }
    324 int QLineEdit::cursorPosition() const { return 0; }
    325 void QLineEdit::setCursorPosition(int) { }
    326 void QLineEdit::setEdited(bool) { }
    327 void QLineEdit::setReadOnly(bool) { }
    328 void QLineEdit::setPlaceholderString(String const&) { }
    329 void QLineEdit::setColors(Color const&, Color const&) { }
    330 IntSize QLineEdit::sizeForCharacterWidth(int) const { return IntSize(); }
    331 int QLineEdit::baselinePosition(int) const { return 0; }
    332 void QLineEdit::setLiveSearch(bool) { }
    333 
    334 QComboBox::QComboBox() { }
    335 QComboBox::~QComboBox() { }
    336 void QComboBox::setFont(WebCore::Font const&) { }
    337 int QComboBox::baselinePosition(int) const { return 0; }
    338 void QComboBox::setWritingDirection(TextDirection) { }
    339 void QComboBox::clear() { }
    340 void QComboBox::appendItem(DeprecatedString const&, KWQListBoxItemType, bool) { }
    341 void QComboBox::setCurrentItem(int) { }
    342 IntSize QComboBox::sizeHint() const { return IntSize(); }
    343 IntRect QComboBox::frameGeometry() const { return IntRect(); }
    344 void QComboBox::setFrameGeometry(IntRect const&) { }
    345 
    346 QScrollBar::QScrollBar(ScrollBarOrientation) { }
    347 QScrollBar::~QScrollBar() { }
    348 void QScrollBar::setSteps(int, int) { }
    349 bool QScrollBar::scroll(KWQScrollDirection, KWQScrollGranularity, float) { return 0; }
    350 bool QScrollBar::setValue(int) { return 0; }
    351 void QScrollBar::setKnobProportion(int, int) { }
    352 
    353 QListBox::QListBox() { }
    354 QListBox::~QListBox() { }
    355 void QListBox::setSelectionMode(QListBox::SelectionMode) { }
    356 void QListBox::setFont(WebCore::Font const&) { }
     315TextField::TextField(TextField::Type) { }
     316TextField::~TextField() { }
     317void TextField::setFont(WebCore::Font const&) { }
     318void TextField::setAlignment(HorizontalAlignment) { }
     319void TextField::setWritingDirection(TextDirection) { }
     320int TextField::maxLength() const { return 0; }
     321void TextField::setMaxLength(int) { }
     322String TextField::text() const { return String(); }
     323void TextField::setText(String const&) { }
     324int TextField::cursorPosition() const { return 0; }
     325void TextField::setCursorPosition(int) { }
     326void TextField::setEdited(bool) { }
     327void TextField::setReadOnly(bool) { }
     328void TextField::setPlaceholderString(String const&) { }
     329void TextField::setColors(Color const&, Color const&) { }
     330IntSize TextField::sizeForCharacterWidth(int) const { return IntSize(); }
     331int TextField::baselinePosition(int) const { return 0; }
     332void TextField::setLiveSearch(bool) { }
     333
     334PopUpButton::PopUpButton() { }
     335PopUpButton::~PopUpButton() { }
     336void PopUpButton::setFont(WebCore::Font const&) { }
     337int PopUpButton::baselinePosition(int) const { return 0; }
     338void PopUpButton::setWritingDirection(TextDirection) { }
     339void PopUpButton::clear() { }
     340void PopUpButton::appendItem(DeprecatedString const&, ListBoxItemType, bool) { }
     341void PopUpButton::setCurrentItem(int) { }
     342IntSize PopUpButton::sizeHint() const { return IntSize(); }
     343IntRect PopUpButton::frameGeometry() const { return IntRect(); }
     344void PopUpButton::setFrameGeometry(IntRect const&) { }
     345
     346ScrollBar::ScrollBar(ScrollBarOrientation) { }
     347ScrollBar::~ScrollBar() { }
     348void ScrollBar::setSteps(int, int) { }
     349bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { return 0; }
     350bool ScrollBar::setValue(int) { return 0; }
     351void ScrollBar::setKnobProportion(int, int) { }
     352
     353ListBox::ListBox() { }
     354ListBox::~ListBox() { }
     355void ListBox::setSelectionMode(ListBox::SelectionMode) { }
     356void ListBox::setFont(WebCore::Font const&) { }
    357357
    358358Color WebCore::focusRingColor() { return 0xFF0000FF; }

  • trunk/WebCore/platform/mac/ClipboardMac.h

    r14916 r15253  
    2626// An implementation of the clipboard class from IE that talks to the Cocoa Pasteboard
    2727
    28 #ifndef KWQCLIPBOARD_H_
    29 #define KWQCLIPBOARD_H_
     28#ifndef ClipboardMac_h
     29#define ClipboardMac_h
    3030
    3131#include "Image.h"

  • trunk/WebCore/platform/mac/ClipboardMac.mm

    r14420 r15253  
    3535
    3636ClipboardMac::ClipboardMac(bool forDragging, NSPasteboard *pasteboard, AccessPolicy policy, FrameMac *frame)
    37   : m_pasteboard(KWQRetain(pasteboard)), m_forDragging(forDragging), m_dragImage(0),
     37  : m_pasteboard(HardRetain(pasteboard)), m_forDragging(forDragging), m_dragImage(0),
    3838    m_policy(policy), m_dragStarted(false), m_frame(frame)
    3939{
    … …  
    4343ClipboardMac::~ClipboardMac()
    4444{
    45     KWQRelease(m_pasteboard);
     45    HardRelease(m_pasteboard);
    4646}
    4747
    … …  
    8787        CFRelease(UTIType);
    8888        if (pbType)
    89             return KWQCFAutorelease(pbType);
     89            return HardAutorelease(pbType);
    9090    }
    9191

  • trunk/WebCore/platform/mac/CursorMac.mm

    r15003 r15253  
    7676
    7777Cursor::Cursor(Image* image)
    78     : m_impl(KWQRetainNSRelease(createCustomCursor(image)))
     78    : m_impl(HardRetainWithNSRelease(createCustomCursor(image)))
    7979{
    8080}
    8181
    8282Cursor::Cursor(const Cursor& other)
    83     : m_impl(KWQRetain(other.m_impl))
     83    : m_impl(HardRetain(other.m_impl))
    8484{
    8585}
    … …  
    8787Cursor::~Cursor()
    8888{
    89     KWQRelease(m_impl);
     89    HardRelease(m_impl);
    9090}
    9191
    9292Cursor& Cursor::operator=(const Cursor& other)
    9393{
    94     KWQRetain(other.m_impl);
    95     KWQRelease(m_impl);
     94    HardRetain(other.m_impl);
     95    HardRelease(m_impl);
    9696    m_impl = other.m_impl;
    9797    return *this;
    … …  
    9999
    100100Cursor::Cursor(NSCursor* c)
    101     : m_impl(KWQRetain(c))
     101    : m_impl(HardRetain(c))
    102102{
    103103}

  • trunk/WebCore/platform/mac/DeprecatedStringMac.mm

    r15251 r15253  
    4747    }
    4848    CFStringGetCharacters(cfs, CFRangeMake (0, size), buffer);
    49     setUnicode((const QChar *)buffer, (unsigned)size);
     49    setUnicode((const DeprecatedChar *)buffer, (unsigned)size);
    5050    if (buffer != fixedSizeBuffer) {
    5151        fastFree(buffer);

  • trunk/WebCore/platform/mac/FontCacheMac.mm

    r14514 r15253  
    3333#import "WebFontCache.h"
    3434#import "WebCoreSystemInterface.h"
    35 #import "KWQListBox.h"
     35#import "ListBox.h"
    3636#import "WebCoreStringTruncator.h"
    3737

  • trunk/WebCore/platform/mac/FontMac.mm

    r14412 r15253  
    3333#import "FontFallbackList.h"
    3434#import "GraphicsContext.h"
    35 #import "KWQKHTMLSettings.h"
     35#import "Settings.h"
    3636
    3737#import "FontData.h"

  • trunk/WebCore/platform/mac/FoundationExtras.h

    r12953 r15253  
    2828// nil-checked CFRetain/CFRelease covers for Objective-C ids
    2929
    30 // Use CFRetain, CFRelease, KWQRetain, or KWQRelease instead of
     30// Use CFRetain, CFRelease, HardRetain, or HardRelease instead of
    3131// -[NSObject retain] and -[NSObject release] if you want to store
    3232// a pointer to an Objective-C object into memory that won't
    3333// be scanned for GC, like a C++ object.
    3434
    35 static inline id KWQRetain(id obj)
     35static inline id HardRetain(id obj)
    3636{
    3737    if (obj) CFRetain(obj);
    … …  
    3939}
    4040
    41 static inline void KWQRelease(id obj)
     41static inline void HardRelease(id obj)
    4242{
    4343    if (obj) CFRelease(obj);
    … …  
    4747// this function first increments the CF retain count, and then
    4848// decrements the NS retain count. This is needed to handle cases where
    49 // -retain/-release aren't equivalent to CFRetain/KWQRelease, such as
     49// -retain/-release aren't equivalent to CFRetain/HardRelease, such as
    5050// when GC is used.
    5151
    52 // Use KWQRetainNSRelease after allocating and initializing a NSObject
     52// Use HardRetainWithNSRelease after allocating and initializing a NSObject
    5353// if you want to store a pointer to that object into memory that won't
    5454// be scanned for GC, like a C++ object.
    5555
    56 static inline id KWQRetainNSRelease(id obj)
     56static inline id HardRetainWithNSRelease(id obj)
    5757{
    58     KWQRetain(obj);
     58    HardRetain(obj);
    5959    [obj release];
    6060    return obj;
    6161}
    6262
    63 // Use KWQCFAutorelease to return an object made by a CoreFoundation
     63// Use HardAutorelease to return an object made by a CoreFoundation
    6464// "create" or "copy" function as an autoreleased and garbage collected
    6565// object. CF objects need to be "made collectable" for autorelease to work
    6666// properly under GC.
    6767
    68 static inline id KWQCFAutorelease(CFTypeRef obj)
     68static inline id HardAutorelease(CFTypeRef obj)
    6969{
    7070    if (obj)

  • trunk/WebCore/platform/mac/ImageMac.mm

    r15095 r15253  
    190190        return 0;
    191191   
    192     m_nsImage = KWQRetainNSRelease([[NSImage alloc] initWithData:(NSData*)data]);
     192    m_nsImage = HardRetainWithNSRelease([[NSImage alloc] initWithData:(NSData*)data]);
    193193    return m_nsImage;
    194194}

  • trunk/WebCore/platform/mac/KURLMac.mm

    r14256 r15253  
    6969NSURL *KURL::getNSURL() const
    7070{
    71     return KWQCFAutorelease(createCFURL());
     71    return HardAutorelease(createCFURL());
    7272}

  • trunk/WebCore/platform/mac/TransferJobMac.mm

    r13821 r15253  
    3333#import "FrameMac.h"
    3434#import "KURL.h"
    35 #import "KWQFormData.h"
    36 #import "KWQLoader.h"
    37 #import "KWQLoader.h"
    38 #import "KWQResourceLoader.h"
     35#import "FormDataMac.h"
     36#import "LoaderFunctions.h"
     37#import "LoaderFunctions.h"
     38#import "WebCoreResourceLoaderImp.h"
    3939#import "Logging.h"
    4040#import "WebCoreFrameBridge.h"
    … …  
    4444TransferJobInternal::~TransferJobInternal()
    4545{
    46     KWQRelease(response);
    47     KWQRelease(loader);
     46    HardRelease(response);
     47    HardRelease(loader);
    4848}
    4949
    … …  
    7171
    7272    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    73     KWQResourceLoader* resourceLoader = [[KWQResourceLoader alloc] initWithJob:this];
     73    WebCoreResourceLoaderImp* resourceLoader = [[WebCoreResourceLoaderImp alloc] initWithJob:this];
    7474
    7575    id <WebCoreResourceHandle> handle;
    … …  
    9999            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)d->response;
    100100            NSDictionary *headers = [httpResponse allHeaderFields];
    101             d->responseHeaders = DeprecatedString::fromNSString(KWQHeaderStringFromDictionary(headers, [httpResponse statusCode]));
     101            d->responseHeaders = DeprecatedString::fromNSString(HeaderStringFromDictionary(headers, [httpResponse statusCode]));
    102102        }
    103103        d->assembledResponseHeaders = true;
    … …  
    115115}
    116116
    117 void TransferJob::setLoader(KWQResourceLoader *loader)
     117void TransferJob::setLoader(WebCoreResourceLoaderImp *loader)
    118118{
    119     KWQRetain(loader);
    120     KWQRelease(d->loader);
     119    HardRetain(loader);
     120    HardRelease(d->loader);
    121121    d->loader = loader;
    122122}
    … …  
    127127    d->retrievedCharset = false;
    128128    d->response = response;
    129     KWQRetain(d->response);
     129    HardRetain(d->response);
    130130    if (d->client)
    131131        d->client->receivedResponse(this, response);

  • trunk/WebCore/platform/mac/WebCoreTextArea.h

    r13852 r15253  
    2727
    2828@class WebCoreTextView;
    29 class QTextEdit;
     29class TextBox;
    3030@protocol WebCoreWidgetHolder;
    3131
    … …  
    3333{
    3434    WebCoreTextView *textView;
    35     QTextEdit *widget;
     35    TextBox *widget;
    3636    NSFont *_font;
    3737    float _lineHeight;
    … …  
    4545}
    4646
    47 - initWithQTextEdit:(QTextEdit *)w;
     47- initWithQTextEdit:(TextBox *)w;
    4848- (void)detachQTextEdit;
    4949
    … …  
    7777- (NSSize)sizeWithColumns:(int)columns rows:(int)rows;
    7878
    79 // paragraph-oriented functions for the benefit of QTextEdit
     79// paragraph-oriented functions for the benefit of TextBox
    8080- (void)setCursorPositionToIndex:(int)index inParagraph:(int)paragraph;
    8181- (void)getCursorPositionAsIndex:(int *)index inParagraph:(int *)paragraph;

  • trunk/WebCore/platform/mac/WebCoreTextArea.mm

    r14336 r15253  
    3131#import "EventNames.h"
    3232#import "Element.h"
    33 #import "KWQKHTMLSettings.h"
    34 #import "KWQTextEdit.h"
     33#import "Settings.h"
     34#import "TextBox.h"
    3535#import "FrameMac.h"
    3636#import "WebCoreFrameBridge.h"
    … …  
    6262
    6363@interface NSView (WebCoreTextArea)
    64 - (void)_KWQ_setKeyboardFocusRingNeedsDisplay;
     64- (void)_webcore_setKeyboardFocusRingNeedsDisplay;
    6565@end
    6666
    6767@interface NSTextView (WebCoreTextArea)
    68 - (NSParagraphStyle *)_KWQ_typingParagraphStyle;
    69 - (void)_KWQ_setTypingParagraphStyle:(NSParagraphStyle *)style;
    70 - (void)_KWQ_updateTypingAttributes:(NSParagraphStyle *)style forLineHeight:(float)lineHeight font:(NSFont *)font;
     68- (NSParagraphStyle *)_webcore_typingParagraphStyle;
     69- (void)_webcore_setTypingParagraphStyle:(NSParagraphStyle *)style;
     70- (void)_webcore_updateTypingAttributes:(NSParagraphStyle *)style forLineHeight:(float)lineHeight font:(NSFont *)font;
    7171@end
    7272
    7373@interface NSTextStorage (WebCoreTextArea)
    74 - (void)_KWQ_setBaseWritingDirection:(NSWritingDirection)direction;
     74- (void)_webcore_setBaseWritingDirection:(NSWritingDirection)direction;
    7575@end
    7676
    … …  
    8787@interface WebCoreTextView : NSTextView <WebCoreWidgetHolder>
    8888{
    89     QTextEdit *widget;
     89    TextBox *widget;
    9090    BOOL disabled;
    9191    BOOL editableIfEnabled;
    … …  
    9494}
    9595
    96 - (void)setWidget:(QTextEdit *)widget;
     96- (void)setWidget:(TextBox *)widget;
    9797
    9898- (void)setEnabled:(BOOL)flag;
    … …  
    186186}
    187187
    188 - initWithQTextEdit:(QTextEdit *)w
     188- initWithQTextEdit:(TextBox *)w
    189189{
    190190    [self init];
    … …  
    483483    [textView setFont:font];
    484484   
    485     NSParagraphStyle *style = [textView _KWQ_typingParagraphStyle];
     485    NSParagraphStyle *style = [textView _webcore_typingParagraphStyle];
    486486    if (_lineHeight) {
    487487        ASSERT(style);
    488         [textView _KWQ_updateTypingAttributes:style forLineHeight:_lineHeight font:_font];
     488        [textView _webcore_updateTypingAttributes:style forLineHeight:_lineHeight font:_font];
    489489    }
    490490}
    … …  
    533533    NSMutableParagraphStyle *newStyle = [paraStyle mutableCopy];
    534534    [newStyle setMinimumLineHeight:lineHeight];
    535     [textView _KWQ_updateTypingAttributes:newStyle forLineHeight:lineHeight font:_font];
     535    [textView _webcore_updateTypingAttributes:newStyle forLineHeight:lineHeight font:_font];
    536536    [newStyle release];
    537537}
    … …  
    564564{
    565565    return inNextValidKeyView && widget
    566         ? FrameMac::nextKeyViewForWidget(widget, KWQSelectingNext)
     566        ? FrameMac::nextKeyViewForWidget(widget, SelectingNext)
    567567        : [super nextKeyView];
    568568}
    … …  
    571571{
    572572   return inNextValidKeyView && widget
    573         ? FrameMac::nextKeyViewForWidget(widget, KWQSelectingPrevious)
     573        ? FrameMac::nextKeyViewForWidget(widget, SelectingPrevious)
    574574        : [super previousKeyView];
    575575}
    … …  
    728728}
    729729
    730 - (void)_KWQ_setKeyboardFocusRingNeedsDisplay
     730- (void)_webcore_setKeyboardFocusRingNeedsDisplay
    731731{
    732732    [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
    … …  
    746746{
    747747    // Set the base writing direction for typing.
    748     NSParagraphStyle *style = [textView _KWQ_typingParagraphStyle];
     748    NSParagraphStyle *style = [textView _webcore_typingParagraphStyle];
    749749    if ([style baseWritingDirection] != direction) {
    750750        NSMutableParagraphStyle *mutableStyle = [style mutableCopy];
    751751        [mutableStyle setBaseWritingDirection:direction];
    752         [textView _KWQ_setTypingParagraphStyle:mutableStyle];
     752        [textView _webcore_setTypingParagraphStyle:mutableStyle];
    753753        [mutableStyle release];
    754754    }
    755755
    756756    // Set the base writing direction for text.
    757     [[textView textStorage] _KWQ_setBaseWritingDirection:direction];
     757    [[textView textStorage] _webcore_setBaseWritingDirection:direction];
    758758    [textView setNeedsDisplay:YES];
    759759}
    … …  
    877877
    878878
    879 - (void)setWidget:(QTextEdit *)w
     879- (void)setWidget:(TextBox *)w
    880880{
    881881    widget = w;
    … …  
    920920        if (widget && widget->client() && !FrameMac::currentEventIsMouseDownInWidget(widget))
    921921            widget->client()->scrollToVisible(widget);
    922         [self _KWQ_setKeyboardFocusRingNeedsDisplay];
     922        [self _webcore_setKeyboardFocusRingNeedsDisplay];
    923923        if (widget && widget->client()) {
    924924            widget->client()->focusIn(widget);
    … …  
    939939
    940940    if (resign) {
    941         [self _KWQ_setKeyboardFocusRingNeedsDisplay];
     941        [self _webcore_setKeyboardFocusRingNeedsDisplay];
    942942
    943943        if (widget && widget->client()) {
    … …  
    11371137}
    11381138
    1139 // Could get fancy and send this to QTextEdit, then RenderTextArea, but there's really no harm
     1139// Could get fancy and send this to TextBox, then RenderTextArea, but there's really no harm
    11401140// in doing this directly right here. Could refactor some day if you disagree.
    11411141
    … …  
    11981198@implementation NSView (WebCoreTextArea)
    11991199
    1200 - (void)_KWQ_setKeyboardFocusRingNeedsDisplay
    1201 {
    1202     [[self superview] _KWQ_setKeyboardFocusRingNeedsDisplay];
     1200- (void)_webcore_setKeyboardFocusRingNeedsDisplay
     1201{
     1202    [[self superview] _webcore_setKeyboardFocusRingNeedsDisplay];
    12031203}
    12041204
    … …  
    12071207@implementation NSTextView (WebCoreTextArea)
    12081208
    1209 - (NSParagraphStyle *)_KWQ_typingParagraphStyle
     1209- (NSParagraphStyle *)_webcore_typingParagraphStyle
    12101210{
    12111211    NSParagraphStyle *style = [[self typingAttributes] objectForKey:NSParagraphStyleAttributeName];
    … …  
    12201220}
    12211221
    1222 - (void)_KWQ_setTypingParagraphStyle:(NSParagraphStyle *)style
     1222- (void)_webcore_setTypingParagraphStyle:(NSParagraphStyle *)style
    12231223{
    12241224    NSParagraphStyle *immutableStyle = [style copy];
    … …  
    12361236}
    12371237
    1238 - (void)_KWQ_updateTypingAttributes:(NSParagraphStyle *)style forLineHeight:(float)lineHeight font:(NSFont *)font
     1238- (void)_webcore_updateTypingAttributes:(NSParagraphStyle *)style forLineHeight:(float)lineHeight font:(NSFont *)font
    12391239{
    12401240    NSDictionary *typingAttrs = [self typingAttributes];
    … …  
    12601260@implementation NSTextStorage (WebCoreTextArea)
    12611261
    1262 - (void)_KWQ_setBaseWritingDirection:(NSWritingDirection)direction
     1262- (void)_webcore_setBaseWritingDirection:(NSWritingDirection)direction
    12631263{
    12641264    unsigned end = [self length];

  • trunk/WebCore/platform/mac/WebCoreTextField.h

    r13852 r15253  
    2626#import <Cocoa/Cocoa.h>
    2727
    28 class QLineEdit;
    29 @class KWQTextFieldFormatter;
     28class TextField;
     29@class WebCoreTextFieldFormatter;
    3030@protocol WebCoreWidgetHolder;
    3131
    32 @interface KWQTextFieldController : NSObject
     32@interface WebCoreTextFieldController : NSObject
    3333{
    3434@private
    3535    NSTextField* field;
    36     QLineEdit *widget;
    37     KWQTextFieldFormatter *formatter;
     36    TextField *widget;
     37    WebCoreTextFieldFormatter *formatter;
    3838    BOOL hasFocus;
    3939    BOOL hasFocusAndSelectionSet;
    … …  
    6767{
    6868@private
    69     KWQTextFieldController* controller;
     69    WebCoreTextFieldController* controller;
    7070    BOOL inNextValidKeyView;
    7171}
    7272
    73 - (id)initWithQLineEdit:(QLineEdit *)widget;
    74 - (KWQTextFieldController *)controller;
     73- (id)initWithQLineEdit:(TextField *)widget;
     74- (WebCoreTextFieldController *)controller;
    7575
    7676@end
    7777
    78 @interface KWQSecureTextField : NSSecureTextField <WebCoreWidgetHolder>
     78@interface WebCoreSecureTextField : NSSecureTextField <WebCoreWidgetHolder>
    7979{
    8080@private
    81     KWQTextFieldController* controller;
     81    WebCoreTextFieldController* controller;
    8282    BOOL inNextValidKeyView;
    8383    BOOL inSetFrameSize;
    8484}
    8585
    86 - (id)initWithQLineEdit:(QLineEdit *)widget;
    87 - (KWQTextFieldController *)controller;
     86- (id)initWithQLineEdit:(TextField *)widget;
     87- (WebCoreTextFieldController *)controller;
    8888
    8989@end
    9090
    91 @interface KWQSearchField : NSSearchField <WebCoreWidgetHolder>
     91@interface WebCoreSearchField : NSSearchField <WebCoreWidgetHolder>
    9292{
    9393@private
    94     KWQTextFieldController* controller;
     94    WebCoreTextFieldController* controller;
    9595    BOOL inNextValidKeyView;
    9696}
    9797
    98 - (id)initWithQLineEdit:(QLineEdit *)widget;
    99 - (KWQTextFieldController *)controller;
     98- (id)initWithQLineEdit:(TextField *)widget;
     99- (WebCoreTextFieldController *)controller;
    100100
    101101@end

  • trunk/WebCore/platform/mac/WebCoreTextField.mm

    r14730 r15253  
    3131#import "FrameMac.h"
    3232#import "HTMLNames.h"
    33 #import "KWQKHTMLSettings.h"
    34 #import "KWQLineEdit.h"
     33#import "Settings.h"
     34#import "TextField.h"
    3535#import "WebCoreFrameBridge.h"
    3636#import "WidgetClient.h"
    … …  
    4141
    4242@interface NSString (WebCoreTextField)
    43 - (int)_KWQ_numComposedCharacterSequences;
    44 - (NSString *)_KWQ_truncateToNumComposedCharacterSequences:(int)num;
     43- (int)_webcore_numComposedCharacterSequences;
     44- (NSString *)_webcore_truncateToNumComposedCharacterSequences:(int)num;
    4545@end
    4646
    4747@interface NSTextField (WebCoreTextField)
    48 - (NSTextView *)_KWQ_currentEditor;
    49 @end
    50 
    51 @interface NSCell (KWQTextFieldKnowsAppKitSecrets)
     48- (NSTextView *)_webcore_currentEditor;
     49@end
     50
     51@interface NSCell (WebCoreTextField)
    5252- (NSMutableDictionary *)_textAttributes;
    5353@end
    5454
    55 @interface NSSearchFieldCell (KWQTextFieldAppKitSecrets)
     55@interface NSSearchFieldCell (WebCoreTextField)
    5656- (void)_addStringToRecentSearches:(NSString *)string;
    5757@end
    5858
    59 @interface NSTextView (KWQTextFieldAppKitSecrets)
     59@interface NSTextView (WebCoreTextField)
    6060- (void)setWantsNotificationForMarkedText:(BOOL)wantsNotification;
    6161@end
    … …  
    6565@interface KWQTextFieldCell : NSTextFieldCell
    6666@end
    67 @interface KWQSecureTextFieldCell : NSSecureTextFieldCell
    68 @end
    69 @interface KWQSearchFieldCell : NSSearchFieldCell
    70 @end
    71 
    72 // KWQTextFieldFormatter enforces a maximum length.
    73 @interface KWQTextFieldFormatter : NSFormatter
     67@interface WebCoreSecureTextFieldCell : NSSecureTextFieldCell
     68@end
     69@interface WebCoreSearchFieldCell : NSSearchFieldCell
     70@end
     71
     72// WebCoreTextFieldFormatter enforces a maximum length.
     73@interface WebCoreTextFieldFormatter : NSFormatter
    7474{
    7575    int maxLength;
    … …  
    7979@end
    8080
    81 @interface KWQTextFieldController (KWQInternal)
    82 - (id)initWithTextField:(NSTextField *)f QLineEdit:(QLineEdit *)w;
     81@interface WebCoreTextFieldController (WebCoreInternal)
     82- (id)initWithTextField:(NSTextField *)f TextField:(TextField *)w;
    8383- (Widget *)widget;
    8484- (void)textChanged;
    … …  
    9494@end
    9595
    96 @implementation KWQTextFieldController
    97 
    98 - (id)initWithTextField:(NSTextField *)f QLineEdit:(QLineEdit *)w
     96@implementation WebCoreTextFieldController
     97
     98- (id)initWithTextField:(NSTextField *)f TextField:(TextField *)w
    9999{
    100100    self = [self init];
    … …  
    105105    widget = w;
    106106    field = f;
    107     formatter = [[KWQTextFieldFormatter alloc] init];
     107    formatter = [[WebCoreTextFieldFormatter alloc] init];
    108108    lastSelectedRange.location = NSNotFound;
    109109    [[field cell] setScrollable:YES];
    … …  
    111111    [field setDelegate:self];
    112112   
    113     if (widget->type() == QLineEdit::Search) {
     113    if (widget->type() == TextField::Search) {
    114114        [field setTarget:self];
    115115        [field setAction:@selector(action:)];
    … …  
    146146{
    147147    NSString *oldValue = [self string];
    148     if ([oldValue _KWQ_numComposedCharacterSequences] > len) {
    149         [field setStringValue:[oldValue _KWQ_truncateToNumComposedCharacterSequences:len]];
     148    if ([oldValue _webcore_numComposedCharacterSequences] > len) {
     149        [field setStringValue:[oldValue _webcore_truncateToNumComposedCharacterSequences:len]];
    150150    }
    151151    [formatter setMaximumLength:len];
    … …  
    167167}
    168168
    169 static DOMHTMLInputElement* inputElement(QLineEdit* widget)
     169static DOMHTMLInputElement* inputElement(TextField* widget)
    170170{
    171171    if (!widget)
    … …  
    185185        return;
    186186   
    187     [[field _KWQ_currentEditor] setWantsNotificationForMarkedText:YES];
     187    [[field _webcore_currentEditor] setWantsNotificationForMarkedText:YES];
    188188
    189189    if (DOMHTMLInputElement* input = inputElement(widget))
    … …  
    211211        return;
    212212   
    213     if (![[field _KWQ_currentEditor] hasMarkedText])
     213    if (![[field _webcore_currentEditor] hasMarkedText])
    214214        if (DOMHTMLInputElement* input = inputElement(widget))
    215215            [FrameMac::bridgeForWidget(widget) textDidChangeInTextField:input];
    … …  
    355355- (NSRange)selectedRange
    356356{
    357     NSText *editor = [field _KWQ_currentEditor];
     357    NSText *editor = [field _webcore_currentEditor];
    358358    return editor ? [editor selectedRange] : lastSelectedRange;
    359359}
    … …  
    364364    // Even though we don't see this in testing, we really don't want
    365365    // an exception in this case, so we protect ourselves.
    366     NSText *editor = [field _KWQ_currentEditor];
     366    NSText *editor = [field _webcore_currentEditor];
    367367    if (editor) { // if we have no focus, we don't have a current editor
    368368        unsigned len = [[editor string] length];
    … …  
    429429        // the focus ring. So we call endEditing: manually if we detect this inconsistency,
    430430        // and the correct our internal impression of the focus state.
    431         if ([field _KWQ_currentEditor] == nil && [field currentEditor] != nil) {
     431        if ([field _webcore_currentEditor] == nil && [field currentEditor] != nil) {
    432432            [[field cell] endEditing:[field currentEditor]];
    433433            [self setHasFocus:NO];
    … …  
    459459    // Calling stringValue can have a side effect of ending International inline input.
    460460    // So don't call it unless there's no editor.
    461     NSText *editor = [field _KWQ_currentEditor];
     461    NSText *editor = [field _webcore_currentEditor];
    462462    if (editor == nil) {
    463463        return [field stringValue];
    … …  
    488488    if (newline.location != NSNotFound)
    489489        result = [result substringToIndex:newline.location];
    490     return [result _KWQ_truncateToNumComposedCharacterSequences:[formatter maximumLength]];
     490    return [result _webcore_truncateToNumComposedCharacterSequences:[formatter maximumLength]];
    491491}
    492492
    … …  
    506506}
    507507
    508 - (id)initWithQLineEdit:(QLineEdit *)w
     508- (id)initWithQLineEdit:(TextField *)w
    509509{
    510510    self = [self init];
    511511    if (!self)
    512512        return nil;
    513     controller = [[KWQTextFieldController alloc] initWithTextField:self QLineEdit:w];
     513    controller = [[WebCoreTextFieldController alloc] initWithTextField:self TextField:w];
    514514    return self;
    515515}
    … …  
    521521}
    522522
    523 - (KWQTextFieldController *)controller
     523- (WebCoreTextFieldController *)controller
    524524{
    525525    return controller;
    … …  
    558558    if (!widget)
    559559        return [super nextKeyView];
    560     return FrameMac::nextKeyViewForWidget(widget, KWQSelectingNext);
     560    return FrameMac::nextKeyViewForWidget(widget, SelectingNext);
    561561}
    562562
    … …  
    568568    if (!widget)
    569569        return [super previousKeyView];
    570     return FrameMac::nextKeyViewForWidget(widget, KWQSelectingPrevious);
     570    return FrameMac::nextKeyViewForWidget(widget, SelectingPrevious);
    571571}
    572572
    … …  
    679679
    680680
    681 @implementation KWQSecureTextField
     681@implementation WebCoreSecureTextField
    682682
    683683+ (Class)cellClass
    684684{
    685     return [KWQSecureTextFieldCell class];
    686 }
    687 
    688 - (id)initWithQLineEdit:(QLineEdit *)w
     685    return [WebCoreSecureTextFieldCell class];
     686}
     687
     688- (id)initWithQLineEdit:(TextField *)w
    689689{
    690690    self = [self init];
    691691    if (!self)
    692692        return nil;
    693     controller = [[KWQTextFieldController alloc] initWithTextField:self QLineEdit:w];
     693    controller = [[WebCoreTextFieldController alloc] initWithTextField:self TextField:w];
    694694    return self;
    695695}
    … …  
    701701}
    702702
    703 - (KWQTextFieldController *)controller
     703- (WebCoreTextFieldController *)controller
    704704{
    705705    return controller;
    … …  
    724724    if (!widget)
    725725        return [super nextKeyView];
    726     return FrameMac::nextKeyViewForWidget(widget, KWQSelectingNext);
     726    return FrameMac::nextKeyViewForWidget(widget, SelectingNext);
    727727}
    728728
    … …  
    734734    if (!widget)
    735735        return [super previousKeyView];
    736     return FrameMac::nextKeyViewForWidget(widget, KWQSelectingPrevious);
     736    return FrameMac::nextKeyViewForWidget(widget, SelectingPrevious);
    737737}
    738738
    … …  
    816816    // unwanted onBlur events and wreak havoc in other ways as well by setting the focus
    817817    // back to the window.
    818     NSText *editor = [self _KWQ_currentEditor];
     818    NSText *editor = [self _webcore_currentEditor];
    819819    if (editor) {
    820820        [editor setSelectedRange:NSMakeRange(0, [[editor string] length])];
    … …  
    859859@end
    860860
    861 @implementation KWQSecureTextFieldCell
     861@implementation WebCoreSecureTextFieldCell
    862862
    863863- (void)editWithFrame:(NSRect)frame inView:(NSView *)view editor:(NSText *)editor delegate:(id)delegate event:(NSEvent *)event
    864864{
    865865    [super editWithFrame:frame inView:view editor:editor delegate:delegate event:event];
    866     ASSERT([delegate isKindOfClass:[KWQSecureTextField class]]);
    867     [[(KWQSecureTextField *)delegate controller] setHasFocus:YES];
     866    ASSERT([delegate isKindOfClass:[WebCoreSecureTextField class]]);
     867    [[(WebCoreSecureTextField *)delegate controller] setHasFocus:YES];
    868868}
    869869
    … …  
    871871{
    872872    [super selectWithFrame:frame inView:view editor:editor delegate:delegate start:start length:length];
    873     ASSERT([delegate isKindOfClass:[KWQSecureTextField class]]);
    874     [[(KWQSecureTextField *)delegate controller] setHasFocus:YES];
     873    ASSERT([delegate isKindOfClass:[WebCoreSecureTextField class]]);
     874    [[(WebCoreSecureTextField *)delegate controller] setHasFocus:YES];
    875875}
    876876
    877877- (NSMutableDictionary *)_textAttributes
    878878{
    879     ASSERT([[self controlView] isKindOfClass:[KWQSecureTextField class]]);
     879    ASSERT([[self controlView] isKindOfClass:[WebCoreSecureTextField class]]);
    880880    NSMutableDictionary* attributes = [super _textAttributes];
    881     [[(KWQSecureTextField*)[self controlView] controller] updateTextAttributes:attributes];
     881    [[(WebCoreSecureTextField*)[self controlView] controller] updateTextAttributes:attributes];
    882882    return attributes;
    883883}
    … …  
    892892@end
    893893
    894 @implementation KWQSearchField
     894@implementation WebCoreSearchField
    895895
    896896+ (Class)cellClass
    897897{
    898     return [KWQSearchFieldCell class];
    899 }
    900 
    901 - (id)initWithQLineEdit:(QLineEdit *)w
     898    return [WebCoreSearchFieldCell class];
     899}
     900
     901- (id)initWithQLineEdit:(TextField *)w
    902902{
    903903    self = [self init];
    904904    if (!self)
    905905        return nil;
    906     controller = [[KWQTextFieldController alloc] initWithTextField:self QLineEdit:w];
     906    controller = [[WebCoreTextFieldController alloc] initWithTextField:self TextField:w];
    907907    return self;
    908908}
    … …  
    914914}
    915915
    916 - (KWQTextFieldController *)controller
     916- (WebCoreTextFieldController *)controller
    917917{
    918918    return controller;
    … …  
    951951    if (!widget)
    952952        return [super nextKeyView];
    953     return FrameMac::nextKeyViewForWidget(widget, KWQSelectingNext);
     953    return FrameMac::nextKeyViewForWidget(widget, SelectingNext);
    954954}
    955955
    … …  
    961961    if (!widget)
    962962        return [super previousKeyView];
    963     return FrameMac::nextKeyViewForWidget(widget, KWQSelectingPrevious);
     963    return FrameMac::nextKeyViewForWidget(widget, SelectingPrevious);
    964964}
    965965
    … …  
    10381038@end
    10391039
    1040 @implementation KWQSearchFieldCell
     1040@implementation WebCoreSearchFieldCell
    10411041
    10421042- (void)editWithFrame:(NSRect)frame inView:(NSView *)view editor:(NSText *)editor delegate:(id)delegate event:(NSEvent *)event
    10431043{
    10441044    [super editWithFrame:frame inView:view editor:editor delegate:delegate event:event];
    1045     ASSERT([delegate isKindOfClass:[KWQSearchField class]]);
    1046     [[(KWQSearchField *)delegate controller] setHasFocus:YES];
     1045    ASSERT([delegate isKindOfClass:[WebCoreSearchField class]]);
     1046    [[(WebCoreSearchField *)delegate controller] setHasFocus:YES];
    10471047}
    10481048
    … …  
    10501050{
    10511051    [super selectWithFrame:frame inView:view editor:editor delegate:delegate start:start length:length];
    1052     ASSERT([delegate isKindOfClass:[KWQSearchField class]]);
    1053     [[(KWQSearchField *)delegate controller] setHasFocus:YES];
     1052    ASSERT([delegate isKindOfClass:[WebCoreSearchField class]]);
     1053    [[(WebCoreSearchField *)delegate controller] setHasFocus:YES];
    10541054}
    10551055
    10561056- (void)_addStringToRecentSearches:(NSString *)string
    10571057{
    1058     ASSERT([[self controlView] isKindOfClass:[KWQSearchField class]]);
    1059     Frame *frame = Frame::frameForWidget([(KWQSearchField*)[self controlView] widget]);
     1058    ASSERT([[self controlView] isKindOfClass:[WebCoreSearchField class]]);
     1059    Frame *frame = Frame::frameForWidget([(WebCoreSearchField*)[self controlView] widget]);
    10601060    if (frame && frame->settings()->privateBrowsingEnabled())
    10611061        return;
    … …  
    10661066- (NSMutableDictionary *)_textAttributes
    10671067{
    1068     ASSERT([[self controlView] isKindOfClass:[KWQSearchField class]]);
     1068    ASSERT([[self controlView] isKindOfClass:[WebCoreSearchField class]]);
    10691069    NSMutableDictionary* attributes = [super _textAttributes];
    1070     [[(KWQSearchField*)[self controlView] controller] updateTextAttributes:attributes];
     1070    [[(WebCoreSearchField*)[self controlView] controller] updateTextAttributes:attributes];
    10711071    return attributes;
    10721072}
    … …  
    10811081@end
    10821082
    1083 @implementation KWQTextFieldFormatter
     1083@implementation WebCoreTextFieldFormatter
    10841084
    10851085- init
    … …  
    11181118    NSString *p = *partialStringPtr;
    11191119
    1120     int length = [p _KWQ_numComposedCharacterSequences];
     1120    int length = [p _webcore_numComposedCharacterSequences];
    11211121    if (length <= maxLength) {
    11221122        return YES;
    … …  
    11481148@implementation NSString (WebCoreTextField)
    11491149
    1150 - (int)_KWQ_numComposedCharacterSequences
     1150- (int)_webcore_numComposedCharacterSequences
    11511151{
    11521152    unsigned i = 0;
    … …  
    11601160}
    11611161
    1162 - (NSString *)_KWQ_truncateToNumComposedCharacterSequences:(int)num
     1162- (NSString *)_webcore_truncateToNumComposedCharacterSequences:(int)num
    11631163{
    11641164    unsigned i = 0;
    … …  
    11821182// The currentEditor method does not work for secure text fields.
    11831183// This works around that limitation.
    1184 - (NSTextView *)_KWQ_currentEditor
     1184- (NSTextView *)_webcore_currentEditor
    11851185{
    11861186    NSResponder *firstResponder = [[self window] firstResponder];

  • trunk/WebCore/platform/mac/WidgetMac.mm

    r14711 r15253  
    6666Widget::Widget(NSView* view) : data(new WidgetPrivate)
    6767{
    68     data->view = KWQRetain(view);
     68    data->view = HardRetain(view);
    6969    data->client = 0;
    7070    data->visible = true;
    … …  
    7676{
    7777    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    78     KWQRelease(data->view);
     78    HardRelease(data->view);
    7979    END_BLOCK_OBJC_EXCEPTIONS;
    8080
    … …  
    290290{
    291291    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    292     KWQRetain(view);
    293     KWQRelease(data->view);
     292    HardRetain(view);
     293    HardRelease(data->view);
    294294    data->view = view;
    295295    END_BLOCK_OBJC_EXCEPTIONS;

  • trunk/WebCore/platform/win/TemporaryLinkStubs.cpp

    r15179 r15253  
    3131#include <stdlib.h>
    3232#include "Node.h"
    33 #include "KWQLineEdit.h"
     33#include "TextField.h"
    3434#include "Font.h"
    35 #include "KWQFileButton.h"
    36 #include "KWQTextEdit.h"
    37 #include "KWQComboBox.h"
     35#include "FileButton.h"
     36#include "TextBox.h"
     37#include "PopUpButton.h"
    3838#include "IntPoint.h"
    3939#include "Widget.h"
    4040#include "GraphicsContext.h"
    41 #include "KWQSlider.h"
     41#include "WebCoreSlider.h"
    4242#include "Cursor.h"
    4343#include "loader.h"
    4444#include "FrameView.h"
    4545#include "KURL.h"
    46 #include "KWQScrollBar.h"
     46#include "WebCoreScrollBar.h"
    4747#include "JavaAppletWidget.h"
    48 #include "KWQScrollBar.h"
     48#include "WebCoreScrollBar.h"
    4949#include "Path.h"
    5050#include "PlatformMouseEvent.h"
    … …  
    7171bool FrameView::isFrameView() const { notImplemented(); return 0; }
    7272
    73 QTextEdit::QTextEdit(Widget*) { notImplemented(); }
    74 QTextEdit::~QTextEdit() { notImplemented(); }
    75 String QTextEdit::textWithHardLineBreaks() const { notImplemented(); return String(); }
    76 IntSize QTextEdit::sizeWithColumnsAndRows(int,int) const { notImplemented(); return IntSize(); }
    77 void QTextEdit::setText(String const&) { notImplemented(); }
    78 void QTextEdit::setColors(Color const&,Color const&) { notImplemented(); }
    79 void QTextEdit::setFont(WebCore::Font const&) { notImplemented(); }
    80 void QTextEdit::setWritingDirection(enum WebCore::TextDirection) { notImplemented(); }
    81 bool QTextEdit::checksDescendantsForFocus() const { notImplemented(); return false; }
    82 int QTextEdit::selectionStart() { notImplemented(); return 0; }
    83 bool QTextEdit::hasSelectedText() const { notImplemented(); return 0; }
    84 int QTextEdit::selectionEnd() { notImplemented(); return 0; }
    85 void QTextEdit::setScrollBarModes(ScrollBarMode,ScrollBarMode) { notImplemented(); }
    86 void QTextEdit::setReadOnly(bool) { notImplemented(); }
    87 void QTextEdit::selectAll() { notImplemented(); }
    88 void QTextEdit::setDisabled(bool) { notImplemented(); }
    89 void QTextEdit::setLineHeight(int) { notImplemented(); }
    90 void QTextEdit::setSelectionStart(int) { notImplemented(); }
    91 void QTextEdit::setCursorPosition(int,int) { notImplemented(); }
    92 String QTextEdit::text() const { notImplemented(); return String(); }
    93 void QTextEdit::setWordWrap(QTextEdit::WrapStyle) { notImplemented(); }
    94 void QTextEdit::setAlignment(HorizontalAlignment) { notImplemented(); }
    95 void QTextEdit::setSelectionEnd(int) { notImplemented(); }
    96 void QTextEdit::getCursorPosition(int*,int*) const { notImplemented(); }
    97 void QTextEdit::setSelectionRange(int,int) { notImplemented(); }
    98 
    99 Widget::FocusPolicy QComboBox::focusPolicy() const { notImplemented(); return NoFocus; }
    100 void QComboBox::populate() { notImplemented(); }
     73TextBox::TextBox(Widget*) { notImplemented(); }
     74TextBox::~TextBox() { notImplemented(); }
     75String TextBox::textWithHardLineBreaks() const { notImplemented(); return String(); }
     76IntSize TextBox::sizeWithColumnsAndRows(int,int) const { notImplemented(); return IntSize(); }
     77void TextBox::setText(String const&) { notImplemented(); }
     78void TextBox::setColors(Color const&,Color const&) { notImplemented(); }
     79void TextBox::setFont(WebCore::Font const&) { notImplemented(); }
     80void TextBox::setWritingDirection(enum WebCore::TextDirection) { notImplemented(); }
     81bool TextBox::checksDescendantsForFocus() const { notImplemented(); return false; }
     82int TextBox::selectionStart() { notImplemented(); return 0; }
     83bool TextBox::hasSelectedText() const { notImplemented(); return 0; }
     84int TextBox::selectionEnd() { notImplemented(); return 0; }
     85void TextBox::setScrollBarModes(ScrollBarMode,ScrollBarMode) { notImplemented(); }
     86void TextBox::setReadOnly(bool) { notImplemented(); }
     87void TextBox::selectAll() { notImplemented(); }
     88void TextBox::setDisabled(bool) { notImplemented(); }
     89void TextBox::setLineHeight(int) { notImplemented(); }
     90void TextBox::setSelectionStart(int) { notImplemented(); }
     91void TextBox::setCursorPosition(int,int) { notImplemented(); }
     92String TextBox::text() const { notImplemented(); return String(); }
     93void TextBox::setWordWrap(TextBox::WrapStyle) { notImplemented(); }
     94void TextBox::setAlignment(HorizontalAlignment) { notImplemented(); }
     95void TextBox::setSelectionEnd(int) { notImplemented(); }
     96void TextBox::getCursorPosition(int*,int*) const { notImplemented(); }
     97void TextBox::setSelectionRange(int,int) { notImplemented(); }
     98
     99Widget::FocusPolicy PopUpButton::focusPolicy() const { notImplemented(); return NoFocus; }
     100void PopUpButton::populate() { notImplemented(); }
    101101
    102102void Widget::enableFlushDrawing() { notImplemented(); }
    … …  
    109109JavaAppletWidget::JavaAppletWidget(IntSize const&,Element*,WTF::HashMap<String,String> const&) { notImplemented(); }
    110110
    111 void QLineEdit::selectAll() { notImplemented(); }
    112 void QLineEdit::addSearchResult() { notImplemented(); }
    113 int QLineEdit::selectionStart() const { notImplemented(); return 0; }
    114 bool QLineEdit::hasSelectedText() const { notImplemented(); return 0; }
    115 String QLineEdit::selectedText() const { notImplemented(); return String(); }
    116 void QLineEdit::setAutoSaveName(String const&) { notImplemented(); }
    117 bool QLineEdit::checksDescendantsForFocus() const { notImplemented(); return false; }
    118 void QLineEdit::setSelection(int,int) { notImplemented(); }
    119 void QLineEdit::setMaxResults(int) { notImplemented(); }
    120 bool QLineEdit::edited() const { notImplemented(); return 0; }
    121 
    122 QSlider::QSlider() { notImplemented(); }
    123 IntSize QSlider::sizeHint() const { notImplemented(); return IntSize(); }
    124 void QSlider::setValue(double) { notImplemented(); }
    125 void QSlider::setMaxValue(double) { notImplemented(); }
    126 void QSlider::setMinValue(double) { notImplemented(); }
    127 QSlider::~QSlider() { notImplemented(); }
    128 void QSlider::setFont(WebCore::Font const&) { notImplemented(); }
    129 double QSlider::value() const { notImplemented(); return 0; }
    130 
    131 void QListBox::setSelected(int,bool) { notImplemented(); }
    132 IntSize QListBox::sizeForNumberOfLines(int) const { notImplemented(); return IntSize(); }
    133 bool QListBox::isSelected(int) const { notImplemented(); return 0; }
    134 void QListBox::appendItem(DeprecatedString const&,KWQListBoxItemType,bool) { notImplemented(); }
    135 void QListBox::doneAppendingItems() { notImplemented(); }
    136 void QListBox::setWritingDirection(TextDirection) { notImplemented(); }
    137 void QListBox::setEnabled(bool) { notImplemented(); }
    138 void QListBox::clear() { notImplemented(); }
    139 bool QListBox::checksDescendantsForFocus() const { notImplemented(); return 0; }
    140 
    141 KWQFileButton::KWQFileButton(Frame*) { notImplemented(); }
    142 void KWQFileButton::click(bool) { notImplemented(); }
    143 IntSize KWQFileButton::sizeForCharacterWidth(int) const { notImplemented(); return IntSize(); }
    144 Widget::FocusPolicy KWQFileButton::focusPolicy() const { notImplemented(); return NoFocus; }
    145 WebCore::IntRect KWQFileButton::frameGeometry() const { notImplemented(); return IntRect(); }
    146 void KWQFileButton::setFilename(DeprecatedString const&) { notImplemented(); }
    147 int KWQFileButton::baselinePosition(int) const { notImplemented(); return 0; }
    148 void KWQFileButton::setFrameGeometry(WebCore::IntRect const&) { notImplemented(); }
    149 void KWQFileButton::setDisabled(bool) { notImplemented(); }
    150 
    151 Widget::FocusPolicy QTextEdit::focusPolicy() const { notImplemented(); return NoFocus; }
    152 Widget::FocusPolicy QSlider::focusPolicy() const { notImplemented(); return NoFocus; }
    153 Widget::FocusPolicy QListBox::focusPolicy() const { notImplemented(); return NoFocus; }
    154 Widget::FocusPolicy QLineEdit::focusPolicy() const { notImplemented(); return NoFocus; }
     111void TextField::selectAll() { notImplemented(); }
     112void TextField::addSearchResult() { notImplemented(); }
     113int TextField::selectionStart() const { notImplemented(); return 0; }
     114bool TextField::hasSelectedText() const { notImplemented(); return 0; }
     115String TextField::selectedText() const { notImplemented(); return String(); }
     116void TextField::setAutoSaveName(String const&) { notImplemented(); }
     117bool TextField::checksDescendantsForFocus() const { notImplemented(); return false; }
     118void TextField::setSelection(int,int) { notImplemented(); }
     119void TextField::setMaxResults(int) { notImplemented(); }
     120bool TextField::edited() const { notImplemented(); return 0; }
     121
     122Slider::Slider() { notImplemented(); }
     123IntSize Slider::sizeHint() const { notImplemented(); return IntSize(); }
     124void Slider::setValue(double) { notImplemented(); }
     125void Slider::setMaxValue(double) { notImplemented(); }
     126void Slider::setMinValue(double) { notImplemented(); }
     127Slider::~Slider() { notImplemented(); }
     128void Slider::setFont(WebCore::Font const&) { notImplemented(); }
     129double Slider::value() const { notImplemented(); return 0; }
     130
     131void ListBox::setSelected(int,bool) { notImplemented(); }
     132IntSize ListBox::sizeForNumberOfLines(int) const { notImplemented(); return IntSize(); }
     133bool ListBox::isSelected(int) const { notImplemented(); return 0; }
     134void ListBox::appendItem(DeprecatedString const&,ListBoxItemType,bool) { notImplemented(); }
     135void ListBox::doneAppendingItems() { notImplemented(); }
     136void ListBox::setWritingDirection(TextDirection) { notImplemented(); }
     137void ListBox::setEnabled(bool) { notImplemented(); }
     138void ListBox::clear() { notImplemented(); }
     139bool ListBox::checksDescendantsForFocus() const { notImplemented(); return 0; }
     140
     141FileButton::FileButton(Frame*) { notImplemented(); }
     142void FileButton::click(bool) { notImplemented(); }
     143IntSize FileButton::sizeForCharacterWidth(int) const { notImplemented(); return IntSize(); }
     144Widget::FocusPolicy FileButton::focusPolicy() const { notImplemented(); return NoFocus; }
     145WebCore::IntRect FileButton::frameGeometry() const { notImplemented(); return IntRect(); }
     146void FileButton::setFilename(DeprecatedString const&) { notImplemented(); }
     147int FileButton::baselinePosition(int) const { notImplemented(); return 0; }
     148void FileButton::setFrameGeometry(WebCore::IntRect const&) { notImplemented(); }
     149void FileButton::setDisabled(bool) { notImplemented(); }
     150
     151Widget::FocusPolicy TextBox::focusPolicy() const { notImplemented(); return NoFocus; }
     152Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; }
     153Widget::FocusPolicy ListBox::focusPolicy() const { notImplemented(); return NoFocus; }
     154Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; }
    155155
    156156Cursor::Cursor(Image*) { notImplemented(); }
    … …  
    163163int WebCore::findNextWordFromIndex(UChar const*,int,int,bool) { notImplemented(); return 0; }
    164164
    165 Vector<char> KWQServeSynchronousRequest(Loader*,DocLoader*,TransferJob*,KURL&,DeprecatedString&) { notImplemented(); return Vector<char>(); }
     165Vector<char> ServeSynchronousRequest(Loader*,DocLoader*,TransferJob*,KURL&,DeprecatedString&) { notImplemented(); return Vector<char>(); }
    166166
    167167void FrameWin::focusWindow() { notImplemented(); }
    … …  
    264264int BrowserExtensionWin::getHistoryLength() { return 0; }
    265265
    266 bool KWQCheckIfReloading(WebCore::DocLoader*) { return false; }
    267 void KWQCheckCacheObjectStatus(DocLoader*, CachedObject*) { }
     266bool CheckIfReloading(WebCore::DocLoader*) { return false; }
     267void CheckCacheObjectStatus(DocLoader*, CachedObject*) { }
    268268
    269269void Widget::setEnabled(bool) { }
    … …  
    311311void Path::addEllipse(const FloatRect&) { }
    312312
    313 QLineEdit::QLineEdit(QLineEdit::Type) { }
    314 QLineEdit::~QLineEdit() { }
    315 void QLineEdit::setFont(WebCore::Font const&) { }
    316 void QLineEdit::setAlignment(HorizontalAlignment) { }
    317 void QLineEdit::setWritingDirection(TextDirection) { }
    318 int QLineEdit::maxLength() const { return 0; }
    319 void QLineEdit::setMaxLength(int) { }
    320 String QLineEdit::text() const { return String(); }
    321 void QLineEdit::setText(String const&) { }
    322 int QLineEdit::cursorPosition() const { return 0; }
    323 void QLineEdit::setCursorPosition(int) { }
    324 void QLineEdit::setEdited(bool) { }
    325 void QLineEdit::setReadOnly(bool) { }
    326 void QLineEdit::setPlaceholderString(String const&) { }
    327 void QLineEdit::setColors(Color const&,Color const&) { }
    328 IntSize QLineEdit::sizeForCharacterWidth(int) const { return IntSize(); }
    329 int QLineEdit::baselinePosition(int) const { return 0; }
    330 void QLineEdit::setLiveSearch(bool) { }
    331 
    332 QComboBox::QComboBox() { }
    333 QComboBox::~QComboBox() { }
    334 void QComboBox::setFont(WebCore::Font const&) { }
    335 int QComboBox::baselinePosition(int) const { return 0; }
    336 void QComboBox::setWritingDirection(TextDirection) { }
    337 void QComboBox::clear() { }
    338 void QComboBox::appendItem(DeprecatedString const&,KWQListBoxItemType,bool) { }
    339 void QComboBox::setCurrentItem(int) { }
    340 IntSize QComboBox::sizeHint() const { return IntSize(); }
    341 IntRect QComboBox::frameGeometry() const { return IntRect(); }
    342 void QComboBox::setFrameGeometry(IntRect const&) { }
    343 
    344 QScrollBar::QScrollBar(ScrollBarOrientation) { }
    345 QScrollBar::~QScrollBar() { }
    346 void QScrollBar::setSteps(int, int) { }
    347 bool QScrollBar::scroll(KWQScrollDirection, KWQScrollGranularity, float) { return 0; }
    348 bool QScrollBar::setValue(int) { return 0; }
    349 void QScrollBar::setKnobProportion(int, int) { }
    350 
    351 QListBox::QListBox() { }
    352 QListBox::~QListBox() { }
    353 void QListBox::setSelectionMode(QListBox::SelectionMode) { }
    354 void QListBox::setFont(WebCore::Font const&) { }
     313TextField::TextField(TextField::Type) { }
     314TextField::~TextField() { }
     315void TextField::setFont(WebCore::Font const&) { }
     316void TextField::setAlignment(HorizontalAlignment) { }
     317void TextField::setWritingDirection(TextDirection) { }
     318int TextField::maxLength() const { return 0; }
     319void TextField::setMaxLength(int) { }
     320String TextField::text() const { return String(); }
     321void TextField::setText(String const&) { }
     322int TextField::cursorPosition() const { return 0; }
     323void TextField::setCursorPosition(int) { }
     324void TextField::setEdited(bool) { }
     325void TextField::setReadOnly(bool) { }
     326void TextField::setPlaceholderString(String const&) { }
     327void TextField::setColors(Color const&,Color const&) { }
     328IntSize TextField::sizeForCharacterWidth(int) const { return IntSize(); }
     329int TextField::baselinePosition(int) const { return 0; }
     330void TextField::setLiveSearch(bool) { }
     331
     332PopUpButton::PopUpButton() { }
     333PopUpButton::~PopUpButton() { }
     334void PopUpButton::setFont(WebCore::Font const&) { }
     335int PopUpButton::baselinePosition(int) const { return 0; }
     336void PopUpButton::setWritingDirection(TextDirection) { }
     337void PopUpButton::clear() { }
     338void PopUpButton::appendItem(DeprecatedString const&,ListBoxItemType,bool) { }
     339void PopUpButton::setCurrentItem(int) { }
     340IntSize PopUpButton::sizeHint() const { return IntSize(); }
     341IntRect PopUpButton::frameGeometry() const { return IntRect(); }
     342void PopUpButton::setFrameGeometry(IntRect const&) { }
     343
     344ScrollBar::ScrollBar(ScrollBarOrientation) { }
     345ScrollBar::~ScrollBar() { }
     346void ScrollBar::setSteps(int, int) { }
     347bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { return 0; }
     348bool ScrollBar::setValue(int) { return 0; }
     349void ScrollBar::setKnobProportion(int, int) { }
     350
     351ListBox::ListBox() { }
     352ListBox::~ListBox() { }
     353void ListBox::setSelectionMode(ListBox::SelectionMode) { }
     354void ListBox::setFont(WebCore::Font const&) { }
    355355
    356356Color WebCore::focusRingColor() { return 0xFF0000FF; }

  • trunk/WebCore/rendering/DataRef.h

    r13674 r15253  
    2424 */
    2525
    26 #ifndef KHTML_DATAREF_H
    27 #define KHTML_DATAREF_H
     26#ifndef DataRef_h
     27#define DataRef_h
    2828
    2929#include <assert.h>

  • trunk/WebCore/rendering/DeprecatedRenderSelect.cpp

    r14929 r15253  
    3131#include "HTMLOptionElement.h"
    3232#include "HTMLSelectElement.h"
    33 #include "KWQComboBox.h"
     33#include "PopUpButton.h"
    3434
    3535using std::min;
    … …  
    5151        setWidget(createListBox());
    5252    else
    53         setWidget(new QComboBox);
     53        setWidget(new PopUpButton);
    5454}
    5555
    … …  
    5858    TextDirection d = style()->direction() == RTL ? RTL : LTR;
    5959    if (m_useListBox)
    60         static_cast<QListBox*>(m_widget)->setWritingDirection(d);
     60        static_cast<ListBox*>(m_widget)->setWritingDirection(d);
    6161    else
    62         static_cast<QComboBox*>(m_widget)->setWritingDirection(d);
     62        static_cast<PopUpButton*>(m_widget)->setWritingDirection(d);
    6363}
    6464
    … …  
    9090                setWidget(createListBox());
    9191            else
    92                 setWidget(new QComboBox);
     92                setWidget(new PopUpButton);
    9393            setWidgetWritingDirection();
    9494        }
    9595
    9696        if (m_useListBox && oldMultiple != m_multiple) {
    97             static_cast<QListBox*>(m_widget)->setSelectionMode(m_multiple ? QListBox::Extended : QListBox::Single);
     97            static_cast<ListBox*>(m_widget)->setSelectionMode(m_multiple ? ListBox::Extended : ListBox::Single);
    9898        }
    9999        m_selectionChanged = true;
    … …  
    109109
    110110        if (m_useListBox)
    111             static_cast<QListBox*>(m_widget)->clear();
     111            static_cast<ListBox*>(m_widget)->clear();
    112112        else
    113             static_cast<QComboBox*>(m_widget)->clear();
     113            static_cast<PopUpButton*>(m_widget)->clear();
    114114
    115115        bool groupEnabled = true;
    … …  
    129129               
    130130                if (m_useListBox)
    131                     static_cast<QListBox*>(m_widget)->appendGroupLabel(label, groupEnabled);
     131                    static_cast<ListBox*>(m_widget)->appendGroupLabel(label, groupEnabled);
    132132                else
    133                     static_cast<QComboBox*>(m_widget)->appendGroupLabel(label);
     133                    static_cast<PopUpButton*>(m_widget)->appendGroupLabel(label);
    134134            } else if (listItems[listIndex]->hasTagName(optionTag)) {
    135135                HTMLOptionElement* optionElement = static_cast<HTMLOptionElement*>(listItems[listIndex]);
    … …  
    149149
    150150                if (m_useListBox)
    151                     static_cast<QListBox*>(m_widget)->appendItem(itemText, groupEnabled && optionElement->isEnabled());
     151                    static_cast<ListBox*>(m_widget)->appendItem(itemText, groupEnabled && optionElement->isEnabled());
    152152                else
    153                     static_cast<QComboBox*>(m_widget)->appendItem(itemText, groupEnabled && optionElement->isEnabled());
     153                    static_cast<PopUpButton*>(m_widget)->appendItem(itemText, groupEnabled && optionElement->isEnabled());
    154154            } else if (listItems[listIndex]->hasTagName(hrTag)) {
    155155                if (!m_useListBox)
    156                     static_cast<QComboBox*>(m_widget)->appendSeparator();
     156                    static_cast<PopUpButton*>(m_widget)->appendSeparator();
    157157            } else
    158158                ASSERT(false);
    … …  
    160160        }
    161161        if (m_useListBox)
    162             static_cast<QListBox*>(m_widget)->doneAppendingItems();
     162            static_cast<ListBox*>(m_widget)->doneAppendingItems();
    163163        setNeedsLayoutAndMinMaxRecalc();
    164164        m_optionsChanged = false;
    … …  
    177177{
    178178    if (m_useListBox) {
    179         // FIXME: Should get the hardcoded constant of 7 by calling a QListBox function,
     179        // FIXME: Should get the hardcoded constant of 7 by calling a ListBox function,
    180180        // as we do for other widget classes.
    181181        return RenderWidget::baselinePosition(f, isRootLineBox) - 7;
    … …  
    211211    // calculate size
    212212    if (m_useListBox) {
    213         QListBox* w = static_cast<QListBox*>(m_widget);
     213        ListBox* w = static_cast<ListBox*>(m_widget);
    214214
    215215
    … …  
    221221        // so I did that ;-)
    222222        if (size < 1)
    223             size = min(static_cast<QListBox*>(m_widget)->count(), 10U);
     223            size = min(static_cast<ListBox*>(m_widget)->count(), 10U);
    224224
    225225        // Let the widget tell us how big it wants to be.
    … …  
    252252    ASSERT(!m_useListBox);
    253253
    254     int index = static_cast<QComboBox*>(m_widget)->currentItem();
     254    int index = static_cast<PopUpButton*>(m_widget)->currentItem();
    255255
    256256    Vector<HTMLElement*> listItems = static_cast<HTMLSelectElement*>(node())->listItems();
    … …  
    279279
    280280        if (found) {
    281             if (index != static_cast<QComboBox*>(m_widget)->currentItem())
    282                 static_cast<QComboBox*>(m_widget)->setCurrentItem(index);
     281            if (index != static_cast<PopUpButton*>(m_widget)->currentItem())
     282                static_cast<PopUpButton*>(m_widget)->setCurrentItem(index);
    283283
    284284            for (unsigned i = 0; i < listItems.size(); ++i)
    … …  
    308308        if (listItems[i]->hasTagName(optionTag))
    309309            static_cast<HTMLOptionElement*>(listItems[i])
    310                 ->m_selected = static_cast<QListBox*>(m_widget)->isSelected(j);
     310                ->m_selected = static_cast<ListBox*>(m_widget)->isSelected(j);
    311311        if (listItems[i]->hasTagName(optionTag) || listItems[i]->hasTagName(optgroupTag))
    312312            ++j;
    … …  
    320320}
    321321
    322 QListBox* DeprecatedRenderSelect::createListBox()
    323 {
    324     QListBox *lb = new QListBox();
    325     lb->setSelectionMode(m_multiple ? QListBox::Extended : QListBox::Single);
     322ListBox* DeprecatedRenderSelect::createListBox()
     323{
     324    ListBox *lb = new ListBox();
     325    lb->setSelectionMode(m_multiple ? ListBox::Extended : ListBox::Single);
    326326    m_ignoreSelectEvents = false;
    327327    return lb;
    … …  
    334334    if (m_useListBox) {
    335335        // if multi-select, we select only the new selected index
    336         QListBox *listBox = static_cast<QListBox*>(m_widget);
     336        ListBox *listBox = static_cast<ListBox*>(m_widget);
    337337        int j = 0;
    338338        for (i = 0; i < int(listItems.size()); i++) {
    … …  
    352352                    static_cast<HTMLOptionElement*>(listItems[i])->m_selected = false;
    353353                else if (static_cast<HTMLOptionElement*>(listItems[i])->selected()) {
    354                     static_cast<QComboBox*>(m_widget)->setCurrentItem(i);
     354                    static_cast<PopUpButton*>(m_widget)->setCurrentItem(i);
    355355                    found = true;
    356356                }

  • trunk/WebCore/rendering/DeprecatedRenderSelect.h

    r14929 r15253  
    2929#include "RenderFormElement.h"
    3030
    31 class QListBox;
     31class ListBox;
    3232
    3333namespace WebCore {
    … …  
    6262
    6363    protected:
    64         QListBox* createListBox();
     64        ListBox* createListBox();
    6565        void setWidgetWritingDirection();
    6666

  • trunk/WebCore/rendering/DeprecatedSlider.cpp

    r14862 r15253  
    3030#include "HTMLNames.h"
    3131#include "HTMLInputElement.h"
    32 #include "KWQSlider.h"
     32#include "WebCoreSlider.h"
    3333
    3434using std::min;
    … …  
    4242    : RenderFormElement(element)
    4343{
    44     setWidget(new QSlider);
     44    setWidget(new Slider);
    4545}
    4646
    … …  
    8484    static_cast<HTMLInputElement*>(node())->setValue(String::number(val));
    8585
    86     QSlider* slider = static_cast<QSlider*>(widget());
     86    Slider* slider = static_cast<Slider*>(widget());
    8787     
    8888    slider->setMinValue(minVal);
    … …  
    9595void DeprecatedSlider::valueChanged(Widget*)
    9696{
    97     QSlider* slider = static_cast<QSlider*>(widget());
     97    Slider* slider = static_cast<Slider*>(widget());
    9898
    9999    double val = slider->value();

  • trunk/WebCore/rendering/InlineFlowBox.cpp

    r14389 r15253  
    249249            RenderText* rt = static_cast<RenderText*>(text->object());
    250250            if (rt->length()) {
    251                 if (needsWordSpacing && QChar(rt->text()[text->start()]).isSpace())
     251                if (needsWordSpacing && DeprecatedChar(rt->text()[text->start()]).isSpace())
    252252                    x += rt->font(m_firstLine)->wordSpacing();
    253                 needsWordSpacing = !QChar(rt->text()[text->end()]).isSpace();
     253                needsWordSpacing = !DeprecatedChar(rt->text()[text->end()]).isSpace();
    254254            }
    255255            text->setXPos(x);

  • trunk/WebCore/rendering/RenderApplet.cpp

    r14327 r15253  
    8686void RenderApplet::layout()
    8787{
    88     KHTMLAssert(needsLayout());
    89     KHTMLAssert(minMaxKnown());
     88    ASSERT(needsLayout());
     89    ASSERT(minMaxKnown());
    9090
    9191    calcWidth();

  • trunk/WebCore/rendering/RenderBlock.cpp

    r15121 r15253  
    3636#include "RenderView.h"
    3737#include "RenderTheme.h"
    38 #include "KWQTextStream.h"
     38#include "TextStream.h"
    3939
    4040using namespace std;
    … …  
    143143    if (beforeChild && beforeChild->parent() != this) {
    144144
    145         KHTMLAssert(beforeChild->parent());
    146         KHTMLAssert(beforeChild->parent()->isAnonymousBlock());
     145        ASSERT(beforeChild->parent());
     146        ASSERT(beforeChild->parent()->isAnonymousBlock());
    147147
    148148        if (newChild->isInline()) {
    … …  
    167167        if (beforeChild && beforeChild->parent() != this) {
    168168            beforeChild = beforeChild->parent();
    169             KHTMLAssert(beforeChild->isAnonymousBlock());
    170             KHTMLAssert(beforeChild->parent() == this);
     169            ASSERT(beforeChild->isAnonymousBlock());
     170            ASSERT(beforeChild->parent() == this);
    171171        }
    172172    }
    … …  
    254254    // |insertionPoint|, because the new child is going to be inserted in between the inlines,
    255255    // splitting them.
    256     KHTMLAssert(isInlineBlockOrInlineTable() || !isInline());
    257     KHTMLAssert(!insertionPoint || insertionPoint->parent() == this);
     256    ASSERT(isInlineBlockOrInlineTable() || !isInline());
     257    ASSERT(!insertionPoint || insertionPoint->parent() == this);
    258258
    259259    m_childrenInline = false;
    … …  
    284284#ifndef NDEBUG
    285285    for (RenderObject *c = firstChild(); c; c = c->nextSibling())
    286         KHTMLAssert(!c->isInline());
     286        ASSERT(!c->isInline());
    287287#endif
    288288}
    … …  
    418418void RenderBlock::layoutBlock(bool relayoutChildren)
    419419{
    420     KHTMLAssert(needsLayout());
    421     KHTMLAssert(minMaxKnown());
     420    ASSERT(needsLayout());
     421    ASSERT(minMaxKnown());
    422422
    423423    if (isInline() && !isInlineBlockOrInlineTable()) // Inline <form>s inside various table elements can
    … …  
    515515        // FIXME: This needs to look at the last flow, not the last child.
    516516        if (lastChild() && lastChild()->hasOverhangingFloats()) {
    517             KHTMLAssert(lastChild()->isRenderBlock());
     517            ASSERT(lastChild()->isRenderBlock());
    518518            m_height = lastChild()->yPos() + static_cast<RenderBlock*>(lastChild())->floatBottom();
    519519            m_height += borderBottom() + paddingBottom();
    … …  
    18251825        // We should never get here, as insertFloatingObject() should only ever be called with floating
    18261826        // objects.
    1827         KHTMLAssert(false);
     1827        ASSERT(false);
    18281828        newObj = 0; // keep gcc's uninitialized variable warnings happy
    18291829    }
    … …  
    27072707void RenderBlock::calcMinMaxWidth()
    27082708{
    2709     KHTMLAssert( !minMaxKnown() );
     2709    ASSERT( !minMaxKnown() );
    27102710
    27112711#ifdef DEBUG_LAYOUT
    … …  
    34163416        // no text-transform or a different text-transform applied to it.
    34173417        RefPtr<StringImpl> oldText = textObj->originalString();
    3418         KHTMLAssert(oldText);
     3418        ASSERT(oldText);
    34193419       
    34203420        if (oldText && oldText->length() > 0) {
    … …  
    34223422           
    34233423            // account for leading spaces and punctuation
    3424             while (length < oldText->length() && (QChar((*oldText)[length]).isSpace() || u_ispunct((*oldText)[length])))
     3424            while (length < oldText->length() && (DeprecatedChar((*oldText)[length]).isSpace() || u_ispunct((*oldText)[length])))
    34253425                length++;
    34263426           
    … …  
    35893589#ifndef NDEBUG
    35903590
    3591 void RenderBlock::dump(QTextStream *stream, DeprecatedString ind) const
     3591void RenderBlock::dump(TextStream *stream, DeprecatedString ind) const
    35923592{
    35933593    if (m_childrenInline) { *stream << " childrenInline"; }

  • trunk/WebCore/rendering/RenderBlock.h

    r15121 r15253  
    268268
    269269#if !NDEBUG
    270     virtual void dump(QTextStream *stream, DeprecatedString ind = "") const;
     270    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;
    271271#endif
    272272

  • trunk/WebCore/rendering/RenderContainer.cpp

    r15087 r15253  
    162162RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)
    163163{
    164     KHTMLAssert(oldChild->parent() == this);
     164    ASSERT(oldChild->parent() == this);
    165165
    166166    // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
    … …  
    352352void RenderContainer::appendChildNode(RenderObject* newChild)
    353353{
    354     KHTMLAssert(newChild->parent() == 0);
    355     KHTMLAssert(!isBlockFlow() || (!newChild->isTableSection() && !newChild->isTableRow() && !newChild->isTableCell()));
     354    ASSERT(newChild->parent() == 0);
     355    ASSERT(!isBlockFlow() || (!newChild->isTableSection() && !newChild->isTableRow() && !newChild->isTableCell()));
    356356
    357357    newChild->setParent(this);
    … …  
    393393    }
    394394
    395     KHTMLAssert(!child->parent());
     395    ASSERT(!child->parent());
    396396    while ( beforeChild->parent() != this && beforeChild->parent()->isAnonymousBlock() )
    397397        beforeChild = beforeChild->parent();
    398     KHTMLAssert(beforeChild->parent() == this);
    399 
    400     KHTMLAssert(!isBlockFlow() || (!child->isTableSection() && !child->isTableRow() && !child->isTableCell()));
     398    ASSERT(beforeChild->parent() == this);
     399
     400    ASSERT(!isBlockFlow() || (!child->isTableSection() && !child->isTableRow() && !child->isTableCell()));
    401401
    402402    if(beforeChild == firstChild())
    … …  
    428428void RenderContainer::layout()
    429429{
    430     KHTMLAssert( needsLayout() );
    431     KHTMLAssert( minMaxKnown() );
     430    ASSERT( needsLayout() );
     431    ASSERT( minMaxKnown() );
    432432
    433433    RenderObject* child = firstChild();

  • trunk/WebCore/rendering/RenderFileButton.cpp

    r14638 r15253  
    3030#include "HTMLFormElement.h"
    3131#include "HTMLInputElement.h"
    32 #include "KWQFileButton.h"
     32#include "FileButton.h"
    3333
    3434namespace WebCore {
    … …  
    3737    : RenderFormElement(element)
    3838{
    39     setWidget(new KWQFileButton(m_view->frame()));
     39    setWidget(new FileButton(m_view->frame()));
    4040}
    4141
    … …  
    4646    // Let the widget tell us how big it wants to be.
    4747    int size = static_cast<HTMLInputElement*>(node())->size();
    48     IntSize s(static_cast<KWQFileButton*>(widget())->sizeForCharacterWidth(size > 0 ? size : 20));
     48    IntSize s(static_cast<FileButton*>(widget())->sizeForCharacterWidth(size > 0 ? size : 20));
    4949
    5050    setIntrinsicWidth(s.width());
    … …  
    5656void RenderFileButton::updateFromElement()
    5757{
    58     static_cast<KWQFileButton*>(widget())->setFilename(
     58    static_cast<FileButton*>(widget())->setFilename(
    5959        static_cast<HTMLInputElement*>(node())->value().deprecatedString());
    6060
    61     static_cast<KWQFileButton*>(widget())->setDisabled(
     61    static_cast<FileButton*>(widget())->setDisabled(
    6262        static_cast<HTMLInputElement*>(node())->disabled());
    6363
    … …  
    7373void RenderFileButton::valueChanged(Widget*)
    7474{
    75     static_cast<HTMLInputElement*>(node())->setValueFromRenderer(static_cast<KWQFileButton*>(widget())->filename());
     75    static_cast<HTMLInputElement*>(node())->setValueFromRenderer(static_cast<FileButton*>(widget())->filename());
    7676    static_cast<HTMLInputElement*>(node())->onChange();
    7777}
    … …  
    8383void RenderFileButton::click(bool sendMouseEvents)
    8484{
    85     static_cast<KWQFileButton*>(widget())->click(sendMouseEvents);
     85    static_cast<FileButton*>(widget())->click(sendMouseEvents);
    8686}
    8787

  • trunk/WebCore/rendering/RenderFlexibleBox.cpp

    r14953 r15253  
    202202void RenderFlexibleBox::calcMinMaxWidth()
    203203{
    204     KHTMLAssert( !minMaxKnown() );
     204    ASSERT( !minMaxKnown() );
    205205
    206206    m_minWidth = 0;
    … …  
    236236void RenderFlexibleBox::layoutBlock(bool relayoutChildren)
    237237{
    238     KHTMLAssert(needsLayout());
    239     KHTMLAssert(minMaxKnown());
     238    ASSERT(needsLayout());
     239    ASSERT(minMaxKnown());
    240240
    241241    if (!relayoutChildren && posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {

  • trunk/WebCore/rendering/RenderFlow.cpp

    r14847 r15253  
    7979{
    8080    RenderFlow* flow = continuationBefore(beforeChild);
    81     KHTMLAssert(!beforeChild || beforeChild->parent()->isRenderBlock() ||
     81    ASSERT(!beforeChild || beforeChild->parent()->isRenderBlock() ||
    8282                beforeChild->parent()->isRenderInline());
    8383    RenderFlow* beforeChildParent = beforeChild ? static_cast<RenderFlow*>(beforeChild->parent()) :
    … …  
    356356    bool inlineFlow = isInlineFlow();
    357357    if (inlineFlow)
    358         KHTMLAssert(m_layer); // The only way a compact/run-in/inline could paint like this is if it has a layer.
     358        ASSERT(m_layer); // The only way a compact/run-in/inline could paint like this is if it has a layer.
    359359
    360360    // If we have no lines then we have no work to do.
    … …  
    427427    bool inlineFlow = isInlineFlow();
    428428    if (inlineFlow)
    429         KHTMLAssert(m_layer); // The only way a compact/run-in/inline could paint like this is if it has a layer.
     429        ASSERT(m_layer); // The only way a compact/run-in/inline could paint like this is if it has a layer.
    430430
    431431    // If we have no lines then we have no work to do.

  • trunk/WebCore/rendering/RenderFormElement.cpp

    r14382 r15253  
    7070void RenderFormElement::layout()
    7171{
    72     KHTMLAssert(needsLayout());
    73     KHTMLAssert(minMaxKnown());
     72    ASSERT(needsLayout());
     73    ASSERT(minMaxKnown());
    7474
    7575    // minimum height

  • trunk/WebCore/rendering/RenderFrameSet.cpp

    r15053 r15253  
    3232#include "HTMLFrameSetElement.h"
    3333#include "HTMLNames.h"
    34 #include "KWQTextStream.h"
     34#include "TextStream.h"
    3535#include "MouseEvent.h"
    3636#include "RenderFrame.h"
    … …  
    9393void RenderFrameSet::layout()
    9494{
    95     KHTMLAssert(needsLayout());
    96     KHTMLAssert(minMaxKnown());
     95    ASSERT(needsLayout());
     96    ASSERT(minMaxKnown());
    9797
    9898    if (!parent()->isFrameSet()) {
    … …  
    541541
    542542#ifndef NDEBUG
    543 void RenderFrameSet::dump(QTextStream* stream, DeprecatedString ind) const
     543void RenderFrameSet::dump(TextStream* stream, DeprecatedString ind) const
    544544{
    545545  *stream << " totalrows=" << element()->totalRows();

  • trunk/WebCore/rendering/RenderFrameSet.h

    r14334 r15253  
    6161
    6262#ifndef NDEBUG
    63     virtual void dump(QTextStream* stream, DeprecatedString ind = "") const;
     63    virtual void dump(TextStream* stream, DeprecatedString ind = "") const;
    6464#endif
    6565

  • trunk/WebCore/rendering/RenderImage.cpp

    r14827 r15253  
    273273void RenderImage::layout()
    274274{
    275     KHTMLAssert(needsLayout());
    276     KHTMLAssert( minMaxKnown() );
     275    ASSERT(needsLayout());
     276    ASSERT( minMaxKnown() );
    277277
    278278    IntRect oldBounds;

  • trunk/WebCore/rendering/RenderInline.cpp

    r15079 r15253  
    271271void RenderInline::calcMinMaxWidth()
    272272{
    273     KHTMLAssert( !minMaxKnown() );
     273    ASSERT( !minMaxKnown() );
    274274
    275275#ifdef DEBUG_LAYOUT

  • trunk/WebCore/rendering/RenderLayer.cpp

    r15191 r15253  
    8080using namespace HTMLNames;
    8181
    82 QScrollBar* RenderLayer::gScrollBar = 0;
     82ScrollBar* RenderLayer::gScrollBar = 0;
    8383
    8484#ifndef NDEBUG
    … …  
    890890    if (hasScrollbar && !m_hBar) {
    891891        FrameView* scrollView = m_object->element()->document()->view();
    892         m_hBar = new QScrollBar(HorizontalScrollBar);
     892        m_hBar = new ScrollBar(HorizontalScrollBar);
    893893        m_hBar->setClient(this);
    894894        scrollView->addChild(m_hBar, 0, -50000);
    … …  
    906906    if (hasScrollbar && !m_vBar) {
    907907        FrameView* scrollView = m_object->element()->document()->view();
    908         m_vBar = new QScrollBar(VerticalScrollBar);
     908        m_vBar = new ScrollBar(VerticalScrollBar);
    909909        m_vBar->setClient(this);
    910910        scrollView->addChild(m_vBar, 0, -50000);
    … …  
    11721172}
    11731173
    1174 bool RenderLayer::scroll(KWQScrollDirection direction, KWQScrollGranularity granularity, float multiplier)
     1174bool RenderLayer::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier)
    11751175{
    11761176    bool didHorizontalScroll = false;
    … …  
    11781178   
    11791179    if (m_hBar != 0) {
    1180         if (granularity == KWQScrollDocument) {
    1181             // Special-case for the KWQScrollDocument granularity. A document scroll can only be up
     1180        if (granularity == ScrollByDocument) {
     1181            // Special-case for the ScrollByDocument granularity. A document scroll can only be up
    11821182            // or down and in both cases the horizontal bar goes all the way to the left.
    1183             didHorizontalScroll = m_hBar->scroll(KWQScrollLeft, KWQScrollDocument, multiplier);
     1183            didHorizontalScroll = m_hBar->scroll(ScrollLeft, ScrollByDocument, multiplier);
    11841184        } else {
    11851185            didHorizontalScroll = m_hBar->scroll(direction, granularity, multiplier);

  • trunk/WebCore/rendering/RenderLayer.h

    r15191 r15253  
    4949#include "WidgetClient.h"
    5050
    51 class QScrollBar;
     51class ScrollBar;
    5252
    5353namespace WebCore {
    … …  
    169169    static ScrollBehavior getHiddenBehavior(const ScrollAlignment& s) { return s.m_rectHidden; }
    170170
    171     static QScrollBar* gScrollBar;
     171    static ScrollBar* gScrollBar;
    172172   
    173173    RenderLayer(RenderObject*);
    … …  
    235235    void setHasHorizontalScrollbar(bool hasScrollbar);
    236236    void setHasVerticalScrollbar(bool hasScrollbar);
    237     QScrollBar* horizontalScrollbar() { return m_hBar; }
    238     QScrollBar* verticalScrollbar() { return m_vBar; }
     237    ScrollBar* horizontalScrollbar() { return m_hBar; }
     238    ScrollBar* verticalScrollbar() { return m_vBar; }
    239239    int verticalScrollbarWidth();
    240240    int horizontalScrollbarHeight();
    … …  
    247247    void updateScrollInfoAfterLayout();
    248248    void slotValueChanged(int);
    249     bool scroll(KWQScrollDirection direction, KWQScrollGranularity granularity, float multiplier=1.0);
     249    bool scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier=1.0);
    250250    void autoscroll();
    251251    bool shouldAutoscroll();
    … …  
    383383   
    384384    // For layers with overflow, we have a pair of scrollbars.
    385     QScrollBar* m_hBar;
    386     QScrollBar* m_vBar;
     385    ScrollBar* m_hBar;
     386    ScrollBar* m_vBar;
    387387   
    388388    // The rectangle for the control to resize layers that have overflow.

  • trunk/WebCore/rendering/RenderLineEdit.cpp

    r14382 r15253  
    3131#include "HTMLFormElement.h"
    3232#include "HTMLInputElement.h"
    33 #include "KWQLineEdit.h"
     33#include "TextField.h"
    3434
    3535namespace WebCore {
    … …  
    4242    , m_updating(false)
    4343{
    44     QLineEdit::Type type;
     44    TextField::Type type;
    4545    switch (element->inputType()) {
    4646        case HTMLInputElement::PASSWORD:
    47             type = QLineEdit::Password;
     47            type = TextField::Password;
    4848            break;
    4949        case HTMLInputElement::SEARCH:
    50             type = QLineEdit::Search;
     50            type = TextField::Search;
    5151            break;
    5252        default:
    53             type = QLineEdit::Normal;
    54     }
    55     QLineEdit* edit = new QLineEdit(type);
    56     if (type == QLineEdit::Search)
     53            type = TextField::Normal;
     54    }
     55    TextField* edit = new TextField(type);
     56    if (type == TextField::Search)
    5757        edit->setLiveSearch(false);
    5858    setWidget(edit);
    … …  
    6262{
    6363    // We only want to call onselect if there actually is a selection
    64     QLineEdit* w = static_cast<QLineEdit*>(m_widget);
     64    TextField* w = static_cast<TextField*>(m_widget);
    6565    if (w->hasSelectedText())
    6666        static_cast<HTMLGenericFormElement*>(node())->onSelect();
    … …  
    9090{
    9191    if (widget())
    92         static_cast<QLineEdit*>(widget())->addSearchResult();
     92        static_cast<TextField*>(widget())->addSearchResult();
    9393}
    9494
    9595void RenderLineEdit::calcMinMaxWidth()
    9696{
    97     KHTMLAssert(!minMaxKnown());
     97    ASSERT(!minMaxKnown());
    9898
    9999    // Let the widget tell us how big it wants to be.
    100100    m_updating = true;
    101101    int size = static_cast<HTMLInputElement*>(node())->size();
    102     IntSize s(static_cast<QLineEdit*>(widget())->sizeForCharacterWidth(size > 0 ? size : 20));
     102    IntSize s(static_cast<TextField*>(widget())->sizeForCharacterWidth(size > 0 ? size : 20));
    103103    m_updating = false;
    104104
    … …  
    113113    RenderFormElement::setStyle(s);
    114114
    115     QLineEdit* w = static_cast<QLineEdit*>(widget());
     115    TextField* w = static_cast<TextField*>(widget());
    116116    w->setAlignment(textAlignment());
    117117    w->setWritingDirection(style()->direction() == RTL ? RTL : LTR);
    … …  
    121121{
    122122    HTMLInputElement* e = static_cast<HTMLInputElement*>(node());
    123     QLineEdit* w = static_cast<QLineEdit*>(widget());
     123    TextField* w = static_cast<TextField*>(widget());
    124124   
    125125    int ml = e->maxLength();
    … …  
    151151    // Handle updating the search attributes.
    152152    w->setPlaceholderString(e->getAttribute(placeholderAttr).deprecatedString());
    153     if (w->type() == QLineEdit::Search) {
     153    if (w->type() == TextField::Search) {
    154154        w->setLiveSearch(!e->getAttribute(incrementalAttr).isNull());
    155155        w->setAutoSaveName(e->getAttribute(autosaveAttr));
    … …  
    167167        return;     // we are getting the value from the DOM and it's not user input.
    168168
    169     String newText = static_cast<QLineEdit*>(widget())->text();
     169    String newText = static_cast<TextField*>(widget())->text();
    170170
    171171    // A null string value is used to indicate that the form control has not altered the original
    … …  
    181181int RenderLineEdit::selectionStart()
    182182{
    183     QLineEdit *lineEdit = static_cast<QLineEdit *>(m_widget);
     183    TextField *lineEdit = static_cast<TextField *>(m_widget);
    184184    int start = lineEdit->selectionStart();
    185185    if (start == -1)
    … …  
    190190int RenderLineEdit::selectionEnd()
    191191{
    192     QLineEdit *lineEdit = static_cast<QLineEdit *>(m_widget);
     192    TextField *lineEdit = static_cast<TextField *>(m_widget);
    193193    int start = lineEdit->selectionStart();
    194194    if (start == -1)
    … …  
    201201    int realStart = max(start, 0);
    202202    int length = max(selectionEnd() - realStart, 0);
    203     static_cast<QLineEdit *>(m_widget)->setSelection(realStart, length);
     203    static_cast<TextField *>(m_widget)->setSelection(realStart, length);
    204204}
    205205
    … …  
    213213        length = 0;
    214214    }
    215     static_cast<QLineEdit *>(m_widget)->setSelection(start, length);
     215    static_cast<TextField *>(m_widget)->setSelection(start, length);
    216216}
    217217
    218218void RenderLineEdit::select()
    219219{
    220     static_cast<QLineEdit*>(m_widget)->selectAll();
     220    static_cast<TextField*>(m_widget)->selectAll();
    221221}
    222222
    223223bool RenderLineEdit::isEdited() const
    224224{
    225     return static_cast<QLineEdit*>(m_widget)->edited();
     225    return static_cast<TextField*>(m_widget)->edited();
    226226}
    227227void RenderLineEdit::setEdited(bool x)
    228228{
    229     static_cast<QLineEdit*>(m_widget)->setEdited(x);
     229    static_cast<TextField*>(m_widget)->setEdited(x);
    230230}
    231231
    … …  
    234234    int realStart = max(start, 0);
    235235    int length = max(end - realStart, 0);
    236     static_cast<QLineEdit *>(m_widget)->setSelection(realStart, length);
     236    static_cast<TextField *>(m_widget)->setSelection(realStart, length);
    237237}
    238238

  • trunk/WebCore/rendering/RenderListItem.cpp

    r14389 r15253  
    211211void RenderListItem::layout()
    212212{
    213     KHTMLAssert(needsLayout());
    214     KHTMLAssert(minMaxKnown());
     213    ASSERT(needsLayout());
     214    ASSERT(minMaxKnown());
    215215   
    216216    updateMarkerLocation();   

  • trunk/WebCore/rendering/RenderListMarker.cpp

    r14827 r15253  
    6666{
    6767    if (number < 2)
    68         return QChar(letterA); // match WinIE (A.) not FireFox (0.)
     68        return DeprecatedChar(letterA); // match WinIE (A.) not FireFox (0.)
    6969
    7070    DeprecatedString letterString;
    7171    while (number > 0) {
    7272        int onesDigit = (number - 1) % 26;
    73         letterString = QChar(letterA + onesDigit) + letterString;
     73        letterString = DeprecatedChar(letterA + onesDigit) + letterString;
    7474        number -= onesDigit;
    7575        number /= 26;
    … …  
    8181static DeprecatedString toHebrew(int number)
    8282{
    83     const QChar tenDigit[] = {1497, 1499, 1500, 1502, 1504, 1505, 1506, 1508, 1510};
     83    const DeprecatedChar tenDigit[] = {1497, 1499, 1500, 1502, 1504, 1505, 1506, 1508, 1510};
    8484
    8585    DeprecatedString letter;
    … …  
    9090    int fourHundreds = number / 400;
    9191    for (int i = 0; i < fourHundreds; i++)
    92         letter += QChar(1511 + 3);
     92        letter += DeprecatedChar(1511 + 3);
    9393    number %= 400;
    9494    if (number / 100)
    95         letter += QChar(1511 + (number / 100) - 1);
     95        letter += DeprecatedChar(1511 + (number / 100) - 1);
    9696    number %= 100;
    9797    if (number == 15 || number == 16) {
    98         letter += QChar(1487 + 9);
    99         letter += QChar(1487 + number - 9);
     98        letter += DeprecatedChar(1487 + 9);
     99        letter += DeprecatedChar(1487 + number - 9);
    100100    } else {
    101101        int tens = number / 10;
    … …  
    104104        number = number % 10;
    105105        if (number)
    106             letter += QChar(1487 + number);
     106            letter += DeprecatedChar(1487 + number);
    107107    }
    108108    return letter;
    … …  
    143143InlineBox* RenderListMarker::createInlineBox(bool, bool isRootLineBox, bool)
    144144{
    145     KHTMLAssert(!isRootLineBox);
     145    ASSERT(!isRootLineBox);
    146146    ListMarkerBox* box = new (renderArena()) ListMarkerBox(this);
    147147    m_inlineBoxWrapper = box;
    … …  
    240240void RenderListMarker::layout()
    241241{
    242     KHTMLAssert(needsLayout());
    243     // ### KHTMLAssert(minMaxKnown());
     242    ASSERT(needsLayout());
     243    // ### ASSERT(minMaxKnown());
    244244    if (!minMaxKnown())
    245245        calcMinMaxWidth();
    … …  
    262262void RenderListMarker::calcMinMaxWidth()
    263263{
    264     KHTMLAssert(!minMaxKnown());
     264    ASSERT(!minMaxKnown());
    265265
    266266    if (m_listImage) {
    … …  
    310310        if (l>16) {l++;} // Skip GREEK SMALL LETTER FINAL SIGMA
    311311
    312         m_item = QChar(945 + l);
     312        m_item = DeprecatedChar(945 + l);
    313313        for (int i = 0; i < (number / 24); i++) {
    314314            m_item += "'";

  • trunk/WebCore/rendering/RenderObject.cpp

    r15121 r15253  
    3737#include "GraphicsContext.h"
    3838#include "HTMLNames.h"
    39 #include "KWQTextStream.h"
    40 #include "KWQWMatrix.h"
     39#include "TextStream.h"
     40#include "AffineTransform.h"
    4141#include "Position.h"
    4242#include "RenderArena.h"
    … …  
    225225void RenderObject::addChild(RenderObject* , RenderObject *)
    226226{
    227     KHTMLAssert(0);
     227    ASSERT(0);
    228228}
    229229
    230230RenderObject* RenderObject::removeChildNode(RenderObject* )
    231231{
    232     KHTMLAssert(0);
     232    ASSERT(0);
    233233    return 0;
    234234}
    … …  
    236236void RenderObject::removeChild(RenderObject* )
    237237{
    238     KHTMLAssert(0);
     238    ASSERT(0);
    239239}
    240240
    241241void RenderObject::appendChildNode(RenderObject*)
    242242{
    243     KHTMLAssert(0);
     243    ASSERT(0);
    244244}
    245245
    246246void RenderObject::insertChildNode(RenderObject*, RenderObject*)
    247247{
    248     KHTMLAssert(0);
     248    ASSERT(0);
    249249}
    250250
    … …  
    623623}
    624624
    625 bool RenderObject::scroll(KWQScrollDirection direction, KWQScrollGranularity granularity, float multiplier)
     625bool RenderObject::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier)
    626626{
    627627    RenderLayer *l = layer();
    … …  
    17911791{
    17921792    DeprecatedString str;
    1793     QTextStream ts(&str);
     1793    TextStream ts(&str);
    17941794    ts << renderName()
    17951795        << "(" << (style() ? style()->refCount() : 0) << ")"
    … …  
    18211821}
    18221822
    1823 void RenderObject::dump(QTextStream *stream, DeprecatedString ind) const
     1823void RenderObject::dump(TextStream *stream, DeprecatedString ind) const
    18241824{
    18251825    if (isAnonymous()) { *stream << " anonymous"; }
    … …  
    25492549void RenderObject::recalcMinMaxWidths()
    25502550{
    2551     KHTMLAssert( m_recalcMinMax );
     2551    ASSERT( m_recalcMinMax );
    25522552
    25532553#ifdef DEBUG_LAYOUT
    … …  
    26082608InlineBox* RenderObject::createInlineBox(bool, bool isRootLineBox, bool)
    26092609{
    2610     KHTMLAssert(!isRootLineBox);
     2610    ASSERT(!isRootLineBox);
    26112611    return new (renderArena()) InlineBox(this);
    26122612}
    … …  
    28892889}
    28902890
    2891 QMatrix RenderObject::localTransform() const
    2892 {
    2893     return QMatrix(1, 0, 0, 1, xPos(), yPos());
     2891AffineTransform RenderObject::localTransform() const
     2892{
     2893    return AffineTransform(1, 0, 0, 1, xPos(), yPos());
    28942894}
    28952895 
    2896 void RenderObject::setLocalTransform(const QMatrix&)
     2896void RenderObject::setLocalTransform(const AffineTransform&)
    28972897{
    28982898    ASSERT(false);
    28992899}
    29002900
    2901 QMatrix RenderObject::absoluteTransform() const
     2901AffineTransform RenderObject::absoluteTransform() const
    29022902{
    29032903    if (parent())

  • trunk/WebCore/rendering/RenderObject.h

    r15121 r15253  
    2828
    2929#include "CachedObjectClient.h"
    30 #include "KWQScrollBar.h"
     30#include "WebCoreScrollBar.h"
    3131#include "VisiblePosition.h"
    32 #include "render_style.h"
     32#include "RenderStyle.h"
    3333
    3434class CSSStyle;
    35 class QMatrix;
    36 class QTextStream;
     35class AffineTransform;
     36class TextStream;
    3737class RenderArena;
    38 
    39 #define KHTMLAssert(x) ASSERT(x)
    4038
    4139/*
    … …  
    4947
    5048namespace WebCore {
    51 
    52 class AffineTransform;
    5349class Color;
    5450class CollapsedBorderValue;
    … …  
    218214#ifndef NDEBUG
    219215    DeprecatedString information() const;
    220     virtual void dump(QTextStream *stream, DeprecatedString ind = "") const;
     216    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;
    221217    void showTreeForThis() const;
    222218#endif
    … …  
    275271    virtual FloatRect relativeBBox(bool includeStroke = true) const;
    276272    // We may eventually want to make these non-virtual
    277     virtual QMatrix localTransform() const;
    278     virtual void setLocalTransform(const QMatrix&);
    279     virtual QMatrix absoluteTransform() const;
     273    virtual AffineTransform localTransform() const;
     274    virtual void setLocalTransform(const AffineTransform&);
     275    virtual AffineTransform absoluteTransform() const;
    280276#endif
    281277   
    … …  
    617613    int scrollHeight() const;
    618614   
    619     virtual bool scroll(KWQScrollDirection direction, KWQScrollGranularity granularity, float multiplier=1.0);
     615    virtual bool scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier=1.0);
    620616
    621617    // The following seven functions are used to implement collapsing margins.

  • trunk/WebCore/rendering/RenderPartObject.cpp

    r15170 r15253  
    241241void RenderPartObject::layout()
    242242{
    243     KHTMLAssert(needsLayout());
    244     KHTMLAssert(minMaxKnown());
     243    ASSERT(needsLayout());
     244    ASSERT(minMaxKnown());
    245245
    246246    calcWidth();

  • trunk/WebCore/rendering/RenderReplaced.cpp

    r14784 r15253  
    7878void RenderReplaced::calcMinMaxWidth()
    7979{
    80     KHTMLAssert( !minMaxKnown());
     80    ASSERT( !minMaxKnown());
    8181
    8282#ifdef DEBUG_LAYOUT

  • trunk/WebCore/rendering/RenderStyle.cpp

    r15251 r15253  
    2323
    2424#include "config.h"
    25 #include "render_style.h"
     25#include "RenderStyle.h"
    2626
    2727#include "cssstyleselector.h"

  • trunk/WebCore/rendering/RenderStyle.h

    r15251 r15253  
    927927protected:
    928928
    929 // !START SYNC!: Keep this in sync with the copy constructor in render_style.cpp
     929// !START SYNC!: Keep this in sync with the copy constructor in RenderStyle.cpp
    930930
    931931    // inherit

  • trunk/WebCore/rendering/RenderTable.cpp

    r15105 r15253  
    3333#include "FixedTableLayout.h"
    3434#include "HTMLNames.h"
    35 #include "KWQTextStream.h"
     35#include "TextStream.h"
    3636#include "RenderTableCell.h"
    3737#include "RenderTableCol.h"
    … …  
    234234void RenderTable::layout()
    235235{
    236     KHTMLAssert(needsLayout());
    237     KHTMLAssert(minMaxKnown());
    238     KHTMLAssert(!needSectionRecalc);
     236    ASSERT(needsLayout());
     237    ASSERT(minMaxKnown());
     238    ASSERT(!needSectionRecalc);
    239239
    240240    if (posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
    … …  
    452452void RenderTable::calcMinMaxWidth()
    453453{
    454     KHTMLAssert(!minMaxKnown());
     454    ASSERT(!minMaxKnown());
    455455
    456456    if (needSectionRecalc)
    … …  
    472472    columns.resize(oldSize + 1);
    473473    int oldSpan = columns[pos].span;
    474     KHTMLAssert(oldSpan > firstSpan);
     474    ASSERT(oldSpan > firstSpan);
    475475    columns[pos].span = firstSpan;
    476476    memmove(columns.data() + pos + 1, columns.data() + pos, (oldSize-pos)*sizeof(ColumnStruct));
    … …  
    10341034
    10351035#ifndef NDEBUG
    1036 void RenderTable::dump(QTextStream *stream, DeprecatedString ind) const
     1036void RenderTable::dump(TextStream *stream, DeprecatedString ind) const
    10371037{
    10381038    if (tCaption)

  • trunk/WebCore/rendering/RenderTable.h

    r14816 r15253  
    112112
    113113#ifndef NDEBUG
    114     virtual void dump(QTextStream *stream, DeprecatedString ind = "") const;
     114    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;
    115115#endif
    116116    struct ColumnStruct {

  • trunk/WebCore/rendering/RenderTableCell.cpp

    r14760 r15253  
    3232#include "HTMLNames.h"
    3333#include "HTMLTableCellElement.h"
    34 #include "KWQTextStream.h"
     34#include "TextStream.h"
    3535
    3636using namespace std;
    … …  
    753753
    754754#ifndef NDEBUG
    755 void RenderTableCell::dump(QTextStream *stream, DeprecatedString ind) const
     755void RenderTableCell::dump(TextStream *stream, DeprecatedString ind) const
    756756{
    757757    *stream << " row=" << _row;

  • trunk/WebCore/rendering/RenderTableCell.h

    r13821 r15253  
    102102
    103103#if !NDEBUG
    104     virtual void dump(QTextStream *stream, DeprecatedString ind = "") const;
     104    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;
    105105#endif
    106106

  • trunk/WebCore/rendering/RenderTableCol.cpp

    r14332 r15253  
    3030#include "HTMLNames.h"
    3131#include "HTMLTableColElement.h"
    32 #include "KWQTextStream.h"
     32#include "TextStream.h"
    3333
    3434namespace WebCore {
    … …  
    6565
    6666#ifndef NDEBUG
    67 void RenderTableCol::dump(QTextStream* stream, DeprecatedString ind) const
     67void RenderTableCol::dump(TextStream* stream, DeprecatedString ind) const
    6868{
    6969    *stream << " span=" << m_span;

  • trunk/WebCore/rendering/RenderTableCol.h

    r13393 r15253  
    4545
    4646#ifndef NDEBUG
    47     virtual void dump(QTextStream*, DeprecatedString) const;
     47    virtual void dump(TextStream*, DeprecatedString) const;
    4848#endif
    4949

  • trunk/WebCore/rendering/RenderTableRow.cpp

    r14659 r15253  
    107107void RenderTableRow::layout()
    108108{
    109     KHTMLAssert(needsLayout());
    110     KHTMLAssert(minMaxKnown());
     109    ASSERT(needsLayout());
     110    ASSERT(minMaxKnown());
    111111
    112112    for (RenderObject *child = firstChild(); child; child = child->nextSibling()) {

  • trunk/WebCore/rendering/RenderTableSection.cpp

    r15101 r15253  
    3131#include "Document.h"
    3232#include "HTMLNames.h"
    33 #include "KWQTextStream.h"
     33#include "TextStream.h"
    3434#include "RenderTableCell.h"
    3535#include "RenderTableCol.h"
    … …  
    10051005
    10061006#ifndef NDEBUG
    1007 void RenderTableSection::dump(QTextStream *stream, DeprecatedString ind) const
     1007void RenderTableSection::dump(TextStream *stream, DeprecatedString ind) const
    10081008{
    10091009    *stream << endl << ind << "grid=(" << gridRows << "," << table()->numEffCols() << ")" << endl << ind;

  • trunk/WebCore/rendering/RenderTableSection.h

    r14816 r15253  
    5454
    5555#ifndef NDEBUG
    56     virtual void dump(QTextStream *stream, DeprecatedString ind = "") const;
     56    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;
    5757#endif
    5858

  • trunk/WebCore/rendering/RenderText.cpp

    r15087 r15253  
    103103    if (str)
    104104        str = str->replace('\\', backslashAsCurrencySymbol());
    105     KHTMLAssert(!str || !str->length() || str->characters());
     105    ASSERT(!str || !str->length() || str->characters());
    106106}
    107107
    … …  
    484484                else
    485485                    w += m_monospaceCharacterWidth;
    486                 if (QChar(c).isSpace() && i > start && !QChar((*str)[i - 1]).isSpace())
     486                if (DeprecatedChar(c).isSpace() && i > start && !DeprecatedChar((*str)[i - 1]).isSpace())
    487487                    w += f->wordSpacing();       
    488488            }
    … …  
    579579    // Use 0 for the leadWidth.   If the text contains a variable width tab, the real width
    580580    // will get measured when trimmedMinMaxWidth calls again with the real leadWidth.
    581     KHTMLAssert( !minMaxKnown() );
     581    ASSERT( !minMaxKnown() );
    582582    calcMinMaxWidth(0);
    583583}
    … …  
    910910    // ### what should happen if we change the text of a
    911911    // RenderBR object ?
    912     KHTMLAssert(!isBR() || (str->length() == 1 && (*str)[0] == '\n'));
    913     KHTMLAssert(!str->length() || str->characters());
     912    ASSERT(!isBR() || (str->length() == 1 && (*str)[0] == '\n'));
     913    ASSERT(!str->length() || str->characters());
    914914
    915915    setNeedsLayoutAndMinMaxRecalc();
    … …  
    943943InlineBox* RenderText::createInlineBox(bool, bool isRootLineBox, bool)
    944944{
    945     KHTMLAssert(!isRootLineBox);
     945    ASSERT(!isRootLineBox);
    946946    InlineTextBox* textBox = new (renderArena()) InlineTextBox(this);
    947947    if (!m_firstTextBox)

  • trunk/WebCore/rendering/RenderText.h

    r14273 r15253  
    2323 */
    2424
    25 #ifndef KHTML_RenderText_H
    26 #define KHTML_RenderText_H
     25#ifndef RenderText_h
     26#define RenderText_h
    2727
    2828#include "RenderObject.h"

  • trunk/WebCore/rendering/RenderTextArea.cpp

    r14953 r15253  
    2727#include "RenderTextArea.h"
    2828
    29 #include "KWQTextEdit.h"
     29#include "TextBox.h"
    3030#include "HTMLTextAreaElement.h"
    3131#include "FrameView.h"
    … …  
    3838    , m_updating(false)
    3939{
    40     QTextEdit* edit = new QTextEdit(m_view);
     40    TextBox* edit = new TextBox(m_view);
    4141
    4242    if (element->wrap() != HTMLTextAreaElement::ta_NoWrap)
    43         edit->setWordWrap(QTextEdit::WidgetWidth);
     43        edit->setWordWrap(TextBox::WidgetWidth);
    4444    else
    45         edit->setWordWrap(QTextEdit::NoWrap);
     45        edit->setWordWrap(TextBox::NoWrap);
    4646
    4747    setWidget(edit);
    … …  
    5858    ASSERT(!minMaxKnown());
    5959
    60     QTextEdit* w = static_cast<QTextEdit*>(m_widget);
     60    TextBox* w = static_cast<TextBox*>(m_widget);
    6161    IntSize size(w->sizeWithColumnsAndRows(
    6262        max(static_cast<HTMLTextAreaElement*>(node())->cols(), 1),
    … …  
    7373    RenderFormElement::setStyle(s);
    7474
    75     QTextEdit* w = static_cast<QTextEdit*>(m_widget);
     75    TextBox* w = static_cast<TextBox*>(m_widget);
    7676    w->setAlignment(textAlignment());
    7777    w->setLineHeight(RenderObject::lineHeight(true));
    … …  
    122122{
    123123    HTMLTextAreaElement* e = static_cast<HTMLTextAreaElement*>(node());
    124     QTextEdit* w = static_cast<QTextEdit*>(m_widget);
     124    TextBox* w = static_cast<TextBox*>(m_widget);
    125125
    126126    w->setReadOnly(e->isReadOnlyControl());
    … …  
    147147String RenderTextArea::text()
    148148{
    149     String txt = static_cast<QTextEdit*>(m_widget)->text();
     149    String txt = static_cast<TextBox*>(m_widget)->text();
    150150    return txt.replace(backslashAsCurrencySymbol(), '\\');
    151151}
    … …  
    153153String RenderTextArea::textWithHardLineBreaks()
    154154{
    155     String txt = static_cast<QTextEdit*>(m_widget)->textWithHardLineBreaks();
     155    String txt = static_cast<TextBox*>(m_widget)->textWithHardLineBreaks();
    156156    return txt.replace(backslashAsCurrencySymbol(), '\\');
    157157}
    … …  
    167167int RenderTextArea::selectionStart()
    168168{
    169     return static_cast<QTextEdit*>(m_widget)->selectionStart();
     169    return static_cast<TextBox*>(m_widget)->selectionStart();
    170170}
    171171
    172172int RenderTextArea::selectionEnd()
    173173{
    174     return static_cast<QTextEdit*>(m_widget)->selectionEnd();
     174    return static_cast<TextBox*>(m_widget)->selectionEnd();
    175175}
    176176
    177177void RenderTextArea::setSelectionStart(int start)
    178178{
    179     static_cast<QTextEdit*>(m_widget)->setSelectionStart(start);
     179    static_cast<TextBox*>(m_widget)->setSelectionStart(start);
    180180}
    181181
    182182void RenderTextArea::setSelectionEnd(int end)
    183183{
    184     static_cast<QTextEdit*>(m_widget)->setSelectionEnd(end);
     184    static_cast<TextBox*>(m_widget)->setSelectionEnd(end);
    185185}
    186186
    187187void RenderTextArea::select()
    188188{
    189     static_cast<QTextEdit*>(m_widget)->selectAll();
     189    static_cast<TextBox*>(m_widget)->selectAll();
    190190}
    191191
    192192void RenderTextArea::setSelectionRange(int start, int end)
    193193{
    194     QTextEdit* textEdit = static_cast<QTextEdit*>(m_widget);
     194    TextBox* textEdit = static_cast<TextBox*>(m_widget);
    195195    textEdit->setSelectionRange(start, end-start);
    196196}
    … …  
    198198void RenderTextArea::selectionChanged(Widget*)
    199199{
    200     QTextEdit* w = static_cast<QTextEdit*>(m_widget);
     200    TextBox* w = static_cast<TextBox*>(m_widget);
    201201
    202202    // We only want to call onselect if there actually is a selection

  • trunk/WebCore/rendering/RenderTextControl.cpp

    r15251 r15253  
    2020
    2121#include "config.h"
    22 #include "RenderTextField.h"
     22#include "RenderTextControl.h"
    2323
    2424#include "Document.h"
    … …  
    4343using namespace std;
    4444
    45 RenderTextField::RenderTextField(Node* node, bool multiLine)
     45RenderTextControl::RenderTextControl(Node* node, bool multiLine)
    4646    : RenderFlexibleBox(node), m_dirty(false), m_multiLine(multiLine)
    4747{
    4848}
    4949
    50 RenderTextField::~RenderTextField()
     50RenderTextControl::~RenderTextControl()
    5151{
    5252    if (m_multiLine && node())
    … …  
    5757}
    5858
    59 void RenderTextField::setStyle(RenderStyle* style)
     59void RenderTextControl::setStyle(RenderStyle* style)
    6060{
    6161    RenderFlexibleBox::setStyle(style);
    … …  
    7272}
    7373
    74 RenderStyle* RenderTextField::createDivStyle(RenderStyle* startStyle)
     74RenderStyle* RenderTextControl::createDivStyle(RenderStyle* startStyle)
    7575{
    7676    RenderStyle* divStyle = new (renderArena()) RenderStyle();
    … …  
    125125}
    126126
    127 void RenderTextField::updateFromElement()
     127void RenderTextControl::updateFromElement()
    128128{
    129129    if (!m_div) {
    … …  
    163163}
    164164
    165 int RenderTextField::selectionStart()
     165int RenderTextControl::selectionStart()
    166166{
    167167    return indexForVisiblePosition(document()->frame()->selection().start());       
    168168}
    169169
    170 int RenderTextField::selectionEnd()
     170int RenderTextControl::selectionEnd()
    171171{
    172172    return indexForVisiblePosition(document()->frame()->selection().end());       
    173173}
    174174
    175 void RenderTextField::setSelectionStart(int start)
     175void RenderTextControl::setSelectionStart(int start)
    176176{
    177177    setSelectionRange(start, max(start, selectionEnd()));
    178178}
    179179 
    180 void RenderTextField::setSelectionEnd(int end)
     180void RenderTextControl::setSelectionEnd(int end)
    181181{
    182182    setSelectionRange(min(end, selectionStart()), end);
    183183}
    184184   
    185 void RenderTextField::select()
     185void RenderTextControl::select()
    186186{
    187187    setSelectionRange(0, text().length());
    188188}
    189189
    190 void RenderTextField::setSelectionRange(int start, int end)
     190void RenderTextControl::setSelectionRange(int start, int end)
    191191{
    192192    end = max(end, 0);
    … …  
    216216}
    217217
    218 VisiblePosition RenderTextField::visiblePositionForIndex(int index)
     218VisiblePosition RenderTextControl::visiblePositionForIndex(int index)
    219219{   
    220220    if (index <= 0)
    … …  
    228228}
    229229
    230 int RenderTextField::indexForVisiblePosition(const VisiblePosition& pos)
     230int RenderTextControl::indexForVisiblePosition(const VisiblePosition& pos)
    231231{
    232232    Position indexPosition = pos.deepEquivalent();
    … …  
    240240}
    241241
    242 void RenderTextField::subtreeHasChanged()
     242void RenderTextControl::subtreeHasChanged()
    243243{
    244244    setEdited(true);
    … …  
    258258}
    259259
    260 String RenderTextField::text()
     260String RenderTextControl::text()
    261261{
    262262    if (m_div)
    … …  
    265265}
    266266
    267 String RenderTextField::textWithHardLineBreaks()
     267String RenderTextControl::textWithHardLineBreaks()
    268268{
    269269    String s("");
    … …  
    306306}
    307307
    308 void RenderTextField::calcHeight()
     308void RenderTextControl::calcHeight()
    309309{
    310310   
    … …  
    328328}
    329329
    330 short RenderTextField::baselinePosition(bool b, bool isRootLineBox) const
     330short RenderTextControl::baselinePosition(bool b, bool isRootLineBox) const
    331331{
    332332    if (m_multiLine)
    … …  
    335335}
    336336
    337 void RenderTextField::calcMinMaxWidth()
     337void RenderTextControl::calcMinMaxWidth()
    338338{
    339339    m_minWidth = 0;
    … …  
    384384}
    385385
    386 void RenderTextField::forwardEvent(Event* evt)
     386void RenderTextControl::forwardEvent(Event* evt)
    387387{
    388388    if (evt->type() == blurEvent) {
    … …  
    397397}
    398398
    399 void RenderTextField::selectionChanged(bool userTriggered)
     399void RenderTextControl::selectionChanged(bool userTriggered)
    400400{
    401401    HTMLGenericFormElement* element = static_cast<HTMLGenericFormElement*>(node());

  • trunk/WebCore/rendering/RenderTextControl.h

    r15251 r15253  
    2828class HTMLTextFieldInnerElement;
    2929
    30 class RenderTextField : public RenderFlexibleBox {
     30class RenderTextControl : public RenderFlexibleBox {
    3131public:
    32     RenderTextField(Node*, bool multiLine);
    33     virtual ~RenderTextField();
     32    RenderTextControl(Node*, bool multiLine);
     33    virtual ~RenderTextControl();
    3434
    3535    virtual void calcHeight();

  • trunk/WebCore/rendering/RenderTheme.cpp

    r15177 r15253  
    2727#include "HTMLInputElement.h"
    2828#include "HTMLNames.h"
    29 #include "render_style.h"
     29#include "RenderStyle.h"
    3030#include "RenderPopupMenu.h"
    3131

  • trunk/WebCore/rendering/RenderThemeMac.mm

    r15177 r15253  
    322322{
    323323    if (!checkbox) {
    324         checkbox = KWQRetainNSRelease([[NSButtonCell alloc] init]);
     324        checkbox = HardRetainWithNSRelease([[NSButtonCell alloc] init]);
    325325        [checkbox setButtonType:NSSwitchButton];
    326326        [checkbox setTitle:nil];
    … …  
    382382{
    383383    if (!radio) {
    384         radio = KWQRetainNSRelease([[NSButtonCell alloc] init]);
     384        radio = HardRetainWithNSRelease([[NSButtonCell alloc] init]);
    385385        [radio setButtonType:NSRadioButton];
    386386        [radio setTitle:nil];
    … …  
    499499{
    500500    if (!button) {
    501         button = KWQRetainNSRelease([[NSButtonCell alloc] init]);
     501        button = HardRetainWithNSRelease([[NSButtonCell alloc] init]);
    502502        [button setTitle:nil];
    503503        [button setButtonType:NSMomentaryPushInButton];
    … …  
    618618{
    619619    if (!popupButton) {
    620         popupButton = KWQRetainNSRelease([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
     620        popupButton = HardRetainWithNSRelease([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
    621621        [popupButton setUsesItemFromMenu:NO];
    622622    }

  • trunk/WebCore/rendering/RenderTreeAsText.cpp

    r14672 r15253  
    4040#if SVG_SUPPORT
    4141#include "KCanvasTreeDebug.h"
    42 #include "KCanvasContainer.h"
     42#include "RenderSVGContainer.h"
    4343#endif
    4444
    4545using namespace WebCore;
    4646
    47 static void writeLayers(QTextStream&, const RenderLayer* rootLayer, RenderLayer*, const IntRect& paintDirtyRect, int indent = 0);
     47static void writeLayers(TextStream&, const RenderLayer* rootLayer, RenderLayer*, const IntRect& paintDirtyRect, int indent = 0);
    4848
    4949#if !SVG_SUPPORT
    50 static QTextStream &operator<<(QTextStream &ts, const IntRect &r)
     50static TextStream &operator<<(TextStream &ts, const IntRect &r)
    5151{
    5252    return ts << "at (" << r.x() << "," << r.y() << ") size " << r.width() << "x" << r.height();
    … …  
    5454#endif
    5555
    56 static void writeIndent(QTextStream &ts, int indent)
     56static void writeIndent(TextStream &ts, int indent)
    5757{
    5858    for (int i = 0; i != indent; ++i) {
    … …  
    6161}
    6262
    63 static void printBorderStyle(QTextStream &ts, const RenderObject &o, const EBorderStyle borderStyle)
     63static void printBorderStyle(TextStream &ts, const RenderObject &o, const EBorderStyle borderStyle)
    6464{
    6565    switch (borderStyle) {
    … …  
    108108}
    109109
    110 static QTextStream &operator<<(QTextStream &ts, const RenderObject &o)
     110static TextStream &operator<<(TextStream &ts, const RenderObject &o)
    111111{
    112112    ts << o.renderName();
    … …  
    229229}
    230230
    231 static void writeTextRun(QTextStream& ts, const RenderText& o, const InlineTextBox& run)
     231static void writeTextRun(TextStream& ts, const RenderText& o, const InlineTextBox& run)
    232232{
    233233    ts << "text run at (" << run.m_x << "," << run.m_y << ") width " << run.m_width;
    … …  
    242242}
    243243
    244 void write(QTextStream &ts, const RenderObject &o, int indent)
     244void write(TextStream &ts, const RenderObject &o, int indent)
    245245{
    246246#if SVG_SUPPORT
    … …  
    251251    }
    252252    if (o.isKCanvasContainer()) {
    253         write(ts, static_cast<const KCanvasContainer&>(o), indent);
     253        write(ts, static_cast<const RenderSVGContainer&>(o), indent);
    254254        return;
    255255    }
    … …  
    288288}
    289289
    290 static void write(QTextStream &ts, RenderLayer &l,
     290static void write(TextStream &ts, RenderLayer &l,
    291291                  const IntRect& layerBounds, const IntRect& backgroundClipRect, const IntRect& clipRect, const IntRect& outlineClipRect,
    292292                  int layerType = 0, int indent = 0)
    … …  
    328328}
    329329   
    330 static void writeLayers(QTextStream &ts, const RenderLayer* rootLayer, RenderLayer* l,
     330static void writeLayers(TextStream &ts, const RenderLayer* rootLayer, RenderLayer* l,
    331331                        const IntRect& paintDirtyRect, int indent)
    332332{
    … …  
    385385}
    386386
    387 static void writeSelection(QTextStream &ts, const RenderObject *o)
     387static void writeSelection(TextStream &ts, const RenderObject *o)
    388388{
    389389    Node *n = o->element();
    … …  
    414414    DeprecatedString s;
    415415    if (o) {
    416         QTextStream ts(&s);
     416        TextStream ts(&s);
    417417#if SVG_SUPPORT
    418418        ts.precision(2);

  • trunk/WebCore/rendering/RenderTreeAsText.h

    r13867 r15253  
    2626#ifdef __cplusplus
    2727
    28 #include "KWQTextStream.h"
     28#include "TextStream.h"
    2929#include "RenderObject.h"
    3030
    … …  
    3434
    3535DeprecatedString externalRepresentation(WebCore::RenderObject *);
    36 void write(QTextStream &ts, const WebCore::RenderObject &o, int indent = 0);
     36void write(TextStream &ts, const WebCore::RenderObject &o, int indent = 0);
    3737
    3838#endif

  • trunk/WebCore/rendering/RenderView.cpp

    r15007 r15253  
    8888void RenderView::calcMinMaxWidth()
    8989{
    90     KHTMLAssert( !minMaxKnown() );
     90    ASSERT( !minMaxKnown() );
    9191
    9292    RenderBlock::calcMinMaxWidth();

  • trunk/WebCore/rendering/RenderWidget.cpp

    r14827 r15253  
    9494RenderWidget::~RenderWidget()
    9595{
    96     KHTMLAssert(m_refCount <= 0);
     96    ASSERT(m_refCount <= 0);
    9797    deleteWidget();
    9898}
    … …  
    141141void RenderWidget::layout()
    142142{
    143     KHTMLAssert(needsLayout());
    144     KHTMLAssert(minMaxKnown());
     143    ASSERT(needsLayout());
     144    ASSERT(minMaxKnown());
    145145
    146146    setNeedsLayout(false);

  • trunk/WebCore/rendering/bidi.cpp

    r14953 r15253  
    755755    // See if we have an unconstructed line box for this object that is also
    756756    // the last item on the line.
    757     KHTMLAssert(obj->isInlineFlow() || obj == this);
     757    ASSERT(obj->isInlineFlow() || obj == this);
    758758    RenderFlow* flow = static_cast<RenderFlow*>(obj);
    759759
    … …  
    770770        // made, we need to place it at the end of the current line.
    771771        InlineBox* newBox = obj->createInlineBox(false, obj == this);
    772         KHTMLAssert(newBox->isInlineFlowBox());
     772        ASSERT(newBox->isInlineFlowBox());
    773773        box = static_cast<InlineFlowBox*>(newBox);
    774774        box->setFirstLineStyleBit(m_firstLine);
    … …  
    873873            int rtLength = rt->length();
    874874            if (rtLength != 0) {
    875                 if (r->start == 0 && needsWordSpacing && QChar(rt->text()[r->start]).isSpace())
     875                if (r->start == 0 && needsWordSpacing && DeprecatedChar(rt->text()[r->start]).isSpace())
    876876                    effectiveWidth += rt->font(m_firstLine)->wordSpacing();
    877                 needsWordSpacing = !QChar(rt->text()[r->stop-1]).isSpace() && r->stop == rtLength;         
     877                needsWordSpacing = !DeprecatedChar(rt->text()[r->stop-1]).isSpace() && r->stop == rtLength;         
    878878            }
    879879            if (!r->compact) {
    … …  
    951951                }
    952952
    953                 KHTMLAssert(spaces <= numSpaces);
     953                ASSERT(spaces <= numSpaces);
    954954
    955955                // Only justify text if whitespace is collapsed.
    … …  
    17771777                curr = next;
    17781778            }
    1779             KHTMLAssert(!m_firstLineBox && !m_lastLineBox);
     1779            ASSERT(!m_firstLineBox && !m_lastLineBox);
    17801780        }
    17811781    } else {
    … …  
    23762376            tmpW += inlineWidth(o, false, true);
    23772377        } else
    2378             KHTMLAssert( false );
     2378            ASSERT( false );
    23792379
    23802380        RenderObject* next = bidiNext(start.block, o, bidi);

  • trunk/WebCore/xml/XSLStyleSheet.cpp

    r15201 r15253  
    3030#include "XSLImportRule.h"
    3131#include "loader.h"
    32 #include "xml_tokenizer.h"
     32#include "XMLTokenizer.h"
    3333#include <libxml/uri.h>
    3434#include <libxslt/xsltutils.h>

  • trunk/WebCore/xml/XSLTProcessor.cpp

    r14973 r15253  
    3434#include "HTMLDocument.h"
    3535#include "HTMLTokenizer.h"
    36 #include "KWQLoader.h"
     36#include "LoaderFunctions.h"
    3737#include "Text.h"
    3838#include "TransferJob.h"
    … …  
    8787            void *oldErrorContext = xmlGenericErrorContext;
    8888           
    89             Vector<char> data = KWQServeSynchronousRequest(Cache::loader(), globalDocLoader, job, finalURL, headers);
     89            Vector<char> data = ServeSynchronousRequest(Cache::loader(), globalDocLoader, job, finalURL, headers);
    9090       
    9191            xmlSetGenericErrorFunc(0, parseErrorFunc);

  • trunk/WebCore/xml/xmlhttprequest.cpp

    r14916 r15253  
    3030#include "FormData.h"
    3131#include "HTMLDocument.h"
    32 #include "KWQLoader.h"
     32#include "LoaderFunctions.h"
    3333#include "PlatformString.h"
    3434#include "RegularExpression.h"
    … …  
    9191        if (c == ';')
    9292            break;
    93         else if (QChar(c).isSpace()) // FIXME: This seems wrong, " " is an invalid MIME type character according to RFC 2045.  bug 8644
     93        else if (DeprecatedChar(c).isSpace()) // FIXME: This seems wrong, " " is an invalid MIME type character according to RFC 2045.  bug 8644
    9494            continue;
    9595        // FIXME: This is a very slow way to build a string, given WebCore::String's implementation.
    … …  
    338338            // avoid deadlock in case the loader wants to use JS on a background thread
    339339            KJS::JSLock::DropAllLocks dropLocks;
    340             data = KWQServeSynchronousRequest(Cache::loader(), m_doc->docLoader(), m_job, finalURL, headers);
     340            data = ServeSynchronousRequest(Cache::loader(), m_doc->docLoader(), m_job, finalURL, headers);
    341341        }
    342342

  • trunk/WebCore/xpath/impl/XPathParser.cpp

    r14729 r15253  
    149149void Parser::skipWS()
    150150{
    151     while (m_nextPos < m_data.length() && QChar(m_data[m_nextPos]).isSpace())
     151    while (m_nextPos < m_data.length() && DeprecatedChar(m_data[m_nextPos]).isSpace())
    152152        ++m_nextPos;
    153153}
Note: See TracChangeset for help on using the changeset viewer.