[webkit-changes] cvs commit: WebCore/kwq KWQCString.h KWQCollection.h KWQDict.h KWQIntDict.h KWQMemArray.h KWQPaintDeviceMetrics.h KWQPtrList.h KWQPtrStack.h KWQValueList.h KWQValueVector.h

Eric eseidel at opensource.apple.com
Fri Sep 2 03:03:22 PDT 2005


eseidel     05/09/02 03:03:21

  Modified:    .        ChangeLog
               kcanvas  KCanvas.cpp KCanvasFilters.h KCanvasItem.h
                        KCanvasPath.h KCanvasRegistry.cpp KCanvasRegistry.h
                        KCanvasResources.h KCanvasTreeDebug.h
                        KCanvasTypes.h KCanvasView.cpp
               kcanvas/device KRenderingDevice.h
                        KRenderingDeviceFactory.cpp
                        KRenderingDeviceFactory.h
                        KRenderingPaintServerGradient.cpp
                        KRenderingPaintServerGradient.h KRenderingStyle.h
               kdom     KDOMSettings.cpp
               kdom/cache KDOMCache.cpp KDOMCache.h KDOMCacheHelper.h
                        KDOMLoader.cpp KDOMLoader.h
               kdom/core DOMList.h DocumentImpl.cpp DocumentImpl.h
                        NamedNodeMapImpl.cpp NamedNodeMapImpl.h
                        NodeImpl.cpp TextImpl.cpp TextImpl.h
               kdom/css CSSPrimitiveValueImpl.cpp CSSPrimitiveValueImpl.h
                        CSSRuleListImpl.h CSSStyleDeclarationImpl.cpp
                        CSSStyleDeclarationImpl.h CSSStyleRuleImpl.cpp
                        CSSStyleRuleImpl.h CSSStyleSelector.cpp
                        CSSStyleSelector.h CSSStyleSheetImpl.cpp
                        CSSValueListImpl.cpp CSSValueListImpl.h Font.cpp
                        Font.h KDOMCSSParser.cpp KDOMCSSParser.h
                        MediaListImpl.cpp MediaListImpl.h StyleBaseImpl.cpp
                        StyleBaseImpl.h StyleSheetListImpl.cpp
                        StyleSheetListImpl.h
               kdom/ecma ScriptInterpreter.cpp
               kdom/events EventTargetImpl.cpp EventTargetImpl.h
               kdom/ls  LSParserImpl.cpp
               kdom/parser KDOMDocumentBuilder.cpp
               kdom/xpath/impl expression.cpp expression.h functions.cpp
                        functions.h path.cpp path.h step.cpp step.h
                        tokenizer.cpp tokenizer.h util.h
                        variablereference.cpp
               kdom/xpointer/impl ElementSchemeImpl.cpp ElementSchemeImpl.h
                        XPointerEvaluatorImpl.cpp
                        XPointerExpressionImpl.cpp XPointerExpressionImpl.h
               ksvg2    KSVGFactory.cpp KSVGFactory.h
               ksvg2/css KSVGCSSParser.cpp KSVGCSSParser.h
                        SVGCSSStyleDeclarationImpl.cpp
                        SVGCSSStyleDeclarationImpl.h
                        SVGCSSStyleSelector.cpp SVGCSSStyleSelector.h
               ksvg2/misc KCanvasRenderingStyle.cpp KSVGTimeScheduler.cpp
                        KSVGTimeScheduler.h
               ksvg2/svg SVGDocumentImpl.cpp SVGDocumentImpl.h
                        SVGFEColorMatrixElementImpl.cpp SVGList.h
                        SVGSVGElementImpl.cpp
               kwq      KWQCString.h KWQCollection.h KWQDict.h KWQIntDict.h
                        KWQMemArray.h KWQPaintDeviceMetrics.h KWQPtrList.h
                        KWQPtrStack.h KWQValueList.h KWQValueVector.h
  Added:       ForwardingHeaders q3cstring.h q3dict.h q3intdict.h
                        q3memarray.h q3paintdevicemetrics.h
                        q3ptrcollection.h q3ptrlist.h q3ptrstack.h
                        q3valuelist.h q3valuevector.h
  Log:
  Bug #: 4799
  Submitted by: eseidel
  Reviewed by: mjs
          * ForwardingHeaders/q3cstring.h: Added.
          * ForwardingHeaders/q3dict.h: Added.
          * ForwardingHeaders/q3intdict.h: Added.
          * ForwardingHeaders/q3memarray.h: Added.
          * ForwardingHeaders/q3paintdevicemetrics.h: Added.
          * ForwardingHeaders/q3ptrcollection.h: Added.
          * ForwardingHeaders/q3ptrlist.h: Added.
          * ForwardingHeaders/q3ptrstack.h: Added.
          * ForwardingHeaders/q3valuelist.h: Added.
          * ForwardingHeaders/q3valuevector.h: Added.
          * kcanvas/KCanvas.cpp:
          (KCanvas::setCanvasSize):
          (KCanvas::invalidate):
          * kcanvas/KCanvasFilters.h:
          (KCanvasFEColorMatrix::values):
          (KCanvasFEColorMatrix::setValues):
          * kcanvas/KCanvasItem.h:
          * kcanvas/KCanvasPath.h:
          * kcanvas/KCanvasRegistry.cpp:
          (operator<<):
          * kcanvas/KCanvasRegistry.h:
          * kcanvas/KCanvasResources.h:
          * kcanvas/KCanvasTreeDebug.h:
          (operator<<):
          * kcanvas/KCanvasTypes.h:
          * kcanvas/KCanvasView.cpp:
          * kcanvas/device/KRenderingDevice.h:
          * kcanvas/device/KRenderingDeviceFactory.cpp:
          (KRenderingDeviceFactory::request):
          (KRenderingDeviceFactory::deviceList):
          * kcanvas/device/KRenderingDeviceFactory.h:
          * kcanvas/device/KRenderingPaintServerGradient.cpp:
          (KCSortedGradientStopList::compareItems):
          * kcanvas/device/KRenderingPaintServerGradient.h:
          * kcanvas/device/KRenderingStyle.h:
          * kdom/KDOMSettings.cpp:
          (KDOMSettings::isAdFiltered):
          * kdom/cache/KDOMCache.cpp:
          (Cache::init):
          (Cache::hasPending):
          (Cache::statistics):
          * kdom/cache/KDOMCache.h:
          * kdom/cache/KDOMCacheHelper.h:
          * kdom/cache/KDOMLoader.cpp:
          (Loader::numRequests):
          (Loader::cancelRequests):
          * kdom/cache/KDOMLoader.h:
          * kdom/core/DOMList.h:
          * kdom/core/DocumentImpl.cpp:
          (DocumentImpl::getElementById):
          (DocumentImpl::setPaintDevice):
          (DocumentImpl::getId):
          * kdom/core/DocumentImpl.h:
          (KDOM::DocumentImpl::paintDeviceMetrics):
          (KDOM::DocumentImpl::IdNameMapping::~IdNameMapping):
          * kdom/core/NamedNodeMapImpl.cpp:
          (RONamedNodeMapImpl::RONamedNodeMapImpl):
          (RONamedNodeMapImpl::getNamedItem):
          * kdom/core/NamedNodeMapImpl.h:
          * kdom/core/NodeImpl.cpp:
          (NodeImpl::compareDocumentPosition):
          * kdom/core/TextImpl.cpp:
          (TextImpl::wholeText):
          (TextImpl::checkChildren):
          (TextImpl::replaceWholeText):
          (TextImpl::logicallyAdjacentTextNodes):
          * kdom/core/TextImpl.h:
          * kdom/css/CSSPrimitiveValueImpl.cpp:
          (CSSPrimitiveValueImpl::computeLength):
          (CSSPrimitiveValueImpl::computeLengthFloat):
          * kdom/css/CSSPrimitiveValueImpl.h:
          * kdom/css/CSSRuleListImpl.h:
          * kdom/css/CSSStyleDeclarationImpl.cpp:
          (CSSStyleDeclarationImpl::CSSStyleDeclarationImpl):
          (CSSStyleDeclarationImpl::operator=):
          (CSSStyleDeclarationImpl::cssText):
          (CSSStyleDeclarationImpl::setCssText):
          (CSSStyleDeclarationImpl::getPropertyCSSValue):
          (CSSStyleDeclarationImpl::removeProperty):
          (CSSStyleDeclarationImpl::getPropertyPriority):
          (CSSStyleDeclarationImpl::setProperty):
          * kdom/css/CSSStyleDeclarationImpl.h:
          (KDOM::CSSStyleDeclarationImpl::values):
          * kdom/css/CSSStyleRuleImpl.cpp:
          (CSSStyleRuleImpl::setSelector):
          * kdom/css/CSSStyleRuleImpl.h:
          (KDOM::CSSStyleRuleImpl::selector):
          * kdom/css/CSSStyleSelector.cpp:
          (CSSStyleSelector::CSSStyleSelector):
          (CSSStyleSelector::computeFontSizes):
          (CSSStyleSelector::computeFontSizesFor):
          (nextFontSize):
          (CSSStyleSelector::addInlineDeclarations):
          (CSSStyleSelector::buildLists):
          (CSSStyleSelectorList::CSSStyleSelectorList):
          (CSSStyleSelectorList::append):
          (CSSStyleSelectorList::collect):
          (CSSOrderedPropertyList::compareItems):
          (CSSOrderedPropertyList::append):
          (CSSStyleSelector::convertToLength):
          (CSSStyleSelector::applyRule):
          * kdom/css/CSSStyleSelector.h:
          (KDOM::CSSStyleSelector::fontSizes):
          (KDOM::CSSStyleSelector::fixedFontSizes):
          * kdom/css/CSSStyleSheetImpl.cpp:
          (CSSStyleSheetImpl::CSSStyleSheetImpl):
          * kdom/css/CSSValueListImpl.cpp:
          (CSSValueListImpl::cssText):
          * kdom/css/CSSValueListImpl.h:
          * kdom/css/Font.cpp:
          (Font::update):
          * kdom/css/Font.h:
          * kdom/css/KDOMCSSParser.cpp:
          (CSSParser::createStyleDeclaration):
          (CSSParser::createCSSStyleDeclaration):
          * kdom/css/KDOMCSSParser.h:
          * kdom/css/MediaListImpl.cpp:
          (MediaListImpl::mediaText):
          (MediaListImpl::deleteMedium):
          * kdom/css/MediaListImpl.h:
          * kdom/css/StyleBaseImpl.cpp:
          (StyleBaseImpl::setParsedValue):
          * kdom/css/StyleBaseImpl.h:
          * kdom/css/StyleSheetListImpl.cpp:
          (StyleSheetListImpl::~StyleSheetListImpl):
          (StyleSheetListImpl::length):
          (StyleSheetListImpl::item):
          * kdom/css/StyleSheetListImpl.h:
          * kdom/ecma/ScriptInterpreter.cpp:
          (ScriptInterpreter::forgetDOMObject):
          * kdom/events/EventTargetImpl.cpp:
          (EventTargetImpl::addEventListener):
          (EventTargetImpl::removeEventListener):
          (EventTargetImpl::dispatchEvent):
          (EventTargetImpl::handleLocalEvents):
          * kdom/events/EventTargetImpl.h:
          * kdom/ls/LSParserImpl.cpp:
          (LSParserImpl::parse):
          * kdom/parser/KDOMDocumentBuilder.cpp:
          * kdom/xpath/impl/expression.cpp:
          (Expression::~Expression):
          (Expression::optimize):
          (Expression::isConstant):
          * kdom/xpath/impl/expression.h:
          * kdom/xpath/impl/functions.cpp:
          (Function::setArguments):
          (FunctionLibrary::getFunction):
          * kdom/xpath/impl/functions.h:
          * kdom/xpath/impl/path.cpp:
          (Path::~Path):
          (Path::optimize):
          (Path::doEvaluate):
          (Path::dump):
          * kdom/xpath/impl/path.h:
          * kdom/xpath/impl/step.cpp:
          (Step::Step):
          (Step::~Step):
          (Step::evaluate):
          (Step::optimize):
          (Step::dump):
          * kdom/xpath/impl/step.h:
          * kdom/xpath/impl/tokenizer.cpp:
          (Tokenizer::isAxisName):
          (Tokenizer::isNodeTypeName):
          * kdom/xpath/impl/tokenizer.h:
          * kdom/xpath/impl/util.h:
          * kdom/xpath/impl/variablereference.cpp:
          (VariableReference::doEvaluate):
          * kdom/xpointer/impl/ElementSchemeImpl.cpp:
          (ElementSchemeImpl::evaluate):
          * kdom/xpointer/impl/ElementSchemeImpl.h:
          * kdom/xpointer/impl/XPointerEvaluatorImpl.cpp:
          (XPointerEvaluatorImpl::createXPointer):
          * kdom/xpointer/impl/XPointerExpressionImpl.cpp:
          * kdom/xpointer/impl/XPointerExpressionImpl.h:
          * ksvg2/KSVGFactory.cpp:
          (KSVGFactory::createPartObject):
          (KSVGFactory::registerPart):
          * ksvg2/KSVGFactory.h:
          (KSVG::KSVGFactory::partList):
          * ksvg2/css/KSVGCSSParser.cpp:
          (SVGCSSParser::createCSSStyleDeclaration):
          * ksvg2/css/KSVGCSSParser.h:
          * ksvg2/css/SVGCSSStyleDeclarationImpl.cpp:
          (SVGCSSStyleDeclarationImpl::SVGCSSStyleDeclarationImpl):
          * ksvg2/css/SVGCSSStyleDeclarationImpl.h:
          * ksvg2/css/SVGCSSStyleSelector.cpp:
          (SVGCSSStyleSelector::loadDefaultStyle):
          (SVGCSSStyleSelector::addExtraDeclarations):
          * ksvg2/css/SVGCSSStyleSelector.h:
          * ksvg2/misc/KCanvasRenderingStyle.cpp:
          (KCanvasRenderingStyle::updateStroke):
          (KCanvasRenderingStyle::cssPrimitiveToLength):
          * ksvg2/misc/KSVGTimeScheduler.cpp:
          (SVGTimer::notifyAll):
          * ksvg2/misc/KSVGTimeScheduler.h:
          * ksvg2/svg/SVGDocumentImpl.cpp:
          (SVGDocumentImpl::finishedParsing):
          (SVGDocumentImpl::recalcStyleSelector):
          * ksvg2/svg/SVGDocumentImpl.h:
          * ksvg2/svg/SVGFEColorMatrixElementImpl.cpp:
          (SVGFEColorMatrixElementImpl::createCanvasItem):
          * ksvg2/svg/SVGList.h:
          * ksvg2/svg/SVGSVGElementImpl.cpp:
          (SVGSVGElementImpl::pixelUnitToMillimeterX):
          (SVGSVGElementImpl::pixelUnitToMillimeterY):
          * kwq/KWQCString.h: Added #define q->q3.
          * kwq/KWQCollection.h:
          * kwq/KWQDict.h:
          * kwq/KWQIntDict.h:
          * kwq/KWQMemArray.h:
          * kwq/KWQPaintDeviceMetrics.h:
          * kwq/KWQPtrList.h:
          * kwq/KWQPtrStack.h:
          * kwq/KWQValueList.h:
          * kwq/KWQValueVector.h:
          Pulled over first section of Qt4 changes from kdom, mapping
          existing Qt3 classes to their new Qt4 names and adding necessary
          #defines to kwq to allow supporting both names.
          http://bugzilla.opendarwin.org/show_bug.cgi?id=4799
  
  Revision  Changes    Path
  1.75      +225 -0    WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- ChangeLog	2 Sep 2005 00:19:26 -0000	1.74
  +++ ChangeLog	2 Sep 2005 10:02:52 -0000	1.75
  @@ -1,3 +1,228 @@
  +2005-09-02  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by mjs.
  +
  +        * ForwardingHeaders/q3cstring.h: Added.
  +        * ForwardingHeaders/q3dict.h: Added.
  +        * ForwardingHeaders/q3intdict.h: Added.
  +        * ForwardingHeaders/q3memarray.h: Added.
  +        * ForwardingHeaders/q3paintdevicemetrics.h: Added.
  +        * ForwardingHeaders/q3ptrcollection.h: Added.
  +        * ForwardingHeaders/q3ptrlist.h: Added.
  +        * ForwardingHeaders/q3ptrstack.h: Added.
  +        * ForwardingHeaders/q3valuelist.h: Added.
  +        * ForwardingHeaders/q3valuevector.h: Added.
  +        * kcanvas/KCanvas.cpp:
  +        (KCanvas::setCanvasSize):
  +        (KCanvas::invalidate):
  +        * kcanvas/KCanvasFilters.h:
  +        (KCanvasFEColorMatrix::values):
  +        (KCanvasFEColorMatrix::setValues):
  +        * kcanvas/KCanvasItem.h:
  +        * kcanvas/KCanvasPath.h:
  +        * kcanvas/KCanvasRegistry.cpp:
  +        (operator<<):
  +        * kcanvas/KCanvasRegistry.h:
  +        * kcanvas/KCanvasResources.h:
  +        * kcanvas/KCanvasTreeDebug.h:
  +        (operator<<):
  +        * kcanvas/KCanvasTypes.h:
  +        * kcanvas/KCanvasView.cpp:
  +        * kcanvas/device/KRenderingDevice.h:
  +        * kcanvas/device/KRenderingDeviceFactory.cpp:
  +        (KRenderingDeviceFactory::request):
  +        (KRenderingDeviceFactory::deviceList):
  +        * kcanvas/device/KRenderingDeviceFactory.h:
  +        * kcanvas/device/KRenderingPaintServerGradient.cpp:
  +        (KCSortedGradientStopList::compareItems):
  +        * kcanvas/device/KRenderingPaintServerGradient.h:
  +        * kcanvas/device/KRenderingStyle.h:
  +        * kdom/KDOMSettings.cpp:
  +        (KDOMSettings::isAdFiltered):
  +        * kdom/cache/KDOMCache.cpp:
  +        (Cache::init):
  +        (Cache::hasPending):
  +        (Cache::statistics):
  +        * kdom/cache/KDOMCache.h:
  +        * kdom/cache/KDOMCacheHelper.h:
  +        * kdom/cache/KDOMLoader.cpp:
  +        (Loader::numRequests):
  +        (Loader::cancelRequests):
  +        * kdom/cache/KDOMLoader.h:
  +        * kdom/core/DOMList.h:
  +        * kdom/core/DocumentImpl.cpp:
  +        (DocumentImpl::getElementById):
  +        (DocumentImpl::setPaintDevice):
  +        (DocumentImpl::getId):
  +        * kdom/core/DocumentImpl.h:
  +        (KDOM::DocumentImpl::paintDeviceMetrics):
  +        (KDOM::DocumentImpl::IdNameMapping::~IdNameMapping):
  +        * kdom/core/NamedNodeMapImpl.cpp:
  +        (RONamedNodeMapImpl::RONamedNodeMapImpl):
  +        (RONamedNodeMapImpl::getNamedItem):
  +        * kdom/core/NamedNodeMapImpl.h:
  +        * kdom/core/NodeImpl.cpp:
  +        (NodeImpl::compareDocumentPosition):
  +        * kdom/core/TextImpl.cpp:
  +        (TextImpl::wholeText):
  +        (TextImpl::checkChildren):
  +        (TextImpl::replaceWholeText):
  +        (TextImpl::logicallyAdjacentTextNodes):
  +        * kdom/core/TextImpl.h:
  +        * kdom/css/CSSPrimitiveValueImpl.cpp:
  +        (CSSPrimitiveValueImpl::computeLength):
  +        (CSSPrimitiveValueImpl::computeLengthFloat):
  +        * kdom/css/CSSPrimitiveValueImpl.h:
  +        * kdom/css/CSSRuleListImpl.h:
  +        * kdom/css/CSSStyleDeclarationImpl.cpp:
  +        (CSSStyleDeclarationImpl::CSSStyleDeclarationImpl):
  +        (CSSStyleDeclarationImpl::operator=):
  +        (CSSStyleDeclarationImpl::cssText):
  +        (CSSStyleDeclarationImpl::setCssText):
  +        (CSSStyleDeclarationImpl::getPropertyCSSValue):
  +        (CSSStyleDeclarationImpl::removeProperty):
  +        (CSSStyleDeclarationImpl::getPropertyPriority):
  +        (CSSStyleDeclarationImpl::setProperty):
  +        * kdom/css/CSSStyleDeclarationImpl.h:
  +        (KDOM::CSSStyleDeclarationImpl::values):
  +        * kdom/css/CSSStyleRuleImpl.cpp:
  +        (CSSStyleRuleImpl::setSelector):
  +        * kdom/css/CSSStyleRuleImpl.h:
  +        (KDOM::CSSStyleRuleImpl::selector):
  +        * kdom/css/CSSStyleSelector.cpp:
  +        (CSSStyleSelector::CSSStyleSelector):
  +        (CSSStyleSelector::computeFontSizes):
  +        (CSSStyleSelector::computeFontSizesFor):
  +        (nextFontSize):
  +        (CSSStyleSelector::addInlineDeclarations):
  +        (CSSStyleSelector::buildLists):
  +        (CSSStyleSelectorList::CSSStyleSelectorList):
  +        (CSSStyleSelectorList::append):
  +        (CSSStyleSelectorList::collect):
  +        (CSSOrderedPropertyList::compareItems):
  +        (CSSOrderedPropertyList::append):
  +        (CSSStyleSelector::convertToLength):
  +        (CSSStyleSelector::applyRule):
  +        * kdom/css/CSSStyleSelector.h:
  +        (KDOM::CSSStyleSelector::fontSizes):
  +        (KDOM::CSSStyleSelector::fixedFontSizes):
  +        * kdom/css/CSSStyleSheetImpl.cpp:
  +        (CSSStyleSheetImpl::CSSStyleSheetImpl):
  +        * kdom/css/CSSValueListImpl.cpp:
  +        (CSSValueListImpl::cssText):
  +        * kdom/css/CSSValueListImpl.h:
  +        * kdom/css/Font.cpp:
  +        (Font::update):
  +        * kdom/css/Font.h:
  +        * kdom/css/KDOMCSSParser.cpp:
  +        (CSSParser::createStyleDeclaration):
  +        (CSSParser::createCSSStyleDeclaration):
  +        * kdom/css/KDOMCSSParser.h:
  +        * kdom/css/MediaListImpl.cpp:
  +        (MediaListImpl::mediaText):
  +        (MediaListImpl::deleteMedium):
  +        * kdom/css/MediaListImpl.h:
  +        * kdom/css/StyleBaseImpl.cpp:
  +        (StyleBaseImpl::setParsedValue):
  +        * kdom/css/StyleBaseImpl.h:
  +        * kdom/css/StyleSheetListImpl.cpp:
  +        (StyleSheetListImpl::~StyleSheetListImpl):
  +        (StyleSheetListImpl::length):
  +        (StyleSheetListImpl::item):
  +        * kdom/css/StyleSheetListImpl.h:
  +        * kdom/ecma/ScriptInterpreter.cpp:
  +        (ScriptInterpreter::forgetDOMObject):
  +        * kdom/events/EventTargetImpl.cpp:
  +        (EventTargetImpl::addEventListener):
  +        (EventTargetImpl::removeEventListener):
  +        (EventTargetImpl::dispatchEvent):
  +        (EventTargetImpl::handleLocalEvents):
  +        * kdom/events/EventTargetImpl.h:
  +        * kdom/ls/LSParserImpl.cpp:
  +        (LSParserImpl::parse):
  +        * kdom/parser/KDOMDocumentBuilder.cpp:
  +        * kdom/xpath/impl/expression.cpp:
  +        (Expression::~Expression):
  +        (Expression::optimize):
  +        (Expression::isConstant):
  +        * kdom/xpath/impl/expression.h:
  +        * kdom/xpath/impl/functions.cpp:
  +        (Function::setArguments):
  +        (FunctionLibrary::getFunction):
  +        * kdom/xpath/impl/functions.h:
  +        * kdom/xpath/impl/path.cpp:
  +        (Path::~Path):
  +        (Path::optimize):
  +        (Path::doEvaluate):
  +        (Path::dump):
  +        * kdom/xpath/impl/path.h:
  +        * kdom/xpath/impl/step.cpp:
  +        (Step::Step):
  +        (Step::~Step):
  +        (Step::evaluate):
  +        (Step::optimize):
  +        (Step::dump):
  +        * kdom/xpath/impl/step.h:
  +        * kdom/xpath/impl/tokenizer.cpp:
  +        (Tokenizer::isAxisName):
  +        (Tokenizer::isNodeTypeName):
  +        * kdom/xpath/impl/tokenizer.h:
  +        * kdom/xpath/impl/util.h:
  +        * kdom/xpath/impl/variablereference.cpp:
  +        (VariableReference::doEvaluate):
  +        * kdom/xpointer/impl/ElementSchemeImpl.cpp:
  +        (ElementSchemeImpl::evaluate):
  +        * kdom/xpointer/impl/ElementSchemeImpl.h:
  +        * kdom/xpointer/impl/XPointerEvaluatorImpl.cpp:
  +        (XPointerEvaluatorImpl::createXPointer):
  +        * kdom/xpointer/impl/XPointerExpressionImpl.cpp:
  +        * kdom/xpointer/impl/XPointerExpressionImpl.h:
  +        * ksvg2/KSVGFactory.cpp:
  +        (KSVGFactory::createPartObject):
  +        (KSVGFactory::registerPart):
  +        * ksvg2/KSVGFactory.h:
  +        (KSVG::KSVGFactory::partList):
  +        * ksvg2/css/KSVGCSSParser.cpp:
  +        (SVGCSSParser::createCSSStyleDeclaration):
  +        * ksvg2/css/KSVGCSSParser.h:
  +        * ksvg2/css/SVGCSSStyleDeclarationImpl.cpp:
  +        (SVGCSSStyleDeclarationImpl::SVGCSSStyleDeclarationImpl):
  +        * ksvg2/css/SVGCSSStyleDeclarationImpl.h:
  +        * ksvg2/css/SVGCSSStyleSelector.cpp:
  +        (SVGCSSStyleSelector::loadDefaultStyle):
  +        (SVGCSSStyleSelector::addExtraDeclarations):
  +        * ksvg2/css/SVGCSSStyleSelector.h:
  +        * ksvg2/misc/KCanvasRenderingStyle.cpp:
  +        (KCanvasRenderingStyle::updateStroke):
  +        (KCanvasRenderingStyle::cssPrimitiveToLength):
  +        * ksvg2/misc/KSVGTimeScheduler.cpp:
  +        (SVGTimer::notifyAll):
  +        * ksvg2/misc/KSVGTimeScheduler.h:
  +        * ksvg2/svg/SVGDocumentImpl.cpp:
  +        (SVGDocumentImpl::finishedParsing):
  +        (SVGDocumentImpl::recalcStyleSelector):
  +        * ksvg2/svg/SVGDocumentImpl.h:
  +        * ksvg2/svg/SVGFEColorMatrixElementImpl.cpp:
  +        (SVGFEColorMatrixElementImpl::createCanvasItem):
  +        * ksvg2/svg/SVGList.h:
  +        * ksvg2/svg/SVGSVGElementImpl.cpp:
  +        (SVGSVGElementImpl::pixelUnitToMillimeterX):
  +        (SVGSVGElementImpl::pixelUnitToMillimeterY):
  +        * kwq/KWQCString.h: Added #define q->q3.
  +        * kwq/KWQCollection.h:
  +        * kwq/KWQDict.h:
  +        * kwq/KWQIntDict.h:
  +        * kwq/KWQMemArray.h:
  +        * kwq/KWQPaintDeviceMetrics.h:
  +        * kwq/KWQPtrList.h:
  +        * kwq/KWQPtrStack.h:
  +        * kwq/KWQValueList.h:
  +        * kwq/KWQValueVector.h:
  +        Pulled over first section of Qt4 changes from kdom, mapping
  +        existing Qt3 classes to their new Qt4 names and adding necessary
  +        #defines to kwq to allow supporting both names.
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=4799
  +
   2005-09-01  Vicki Murley  <vicki at apple.com>
   
           Reviewed by John.
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3cstring.h
  
  Index: q3cstring.h
  ===================================================================
  #import "KWQCString.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3dict.h
  
  Index: q3dict.h
  ===================================================================
  #import "KWQDict.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3intdict.h
  
  Index: q3intdict.h
  ===================================================================
  #import "KWQIntDict.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3memarray.h
  
  Index: q3memarray.h
  ===================================================================
  #import "KWQMemArray.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3paintdevicemetrics.h
  
  Index: q3paintdevicemetrics.h
  ===================================================================
  #import "KWQPaintDeviceMetrics.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3ptrcollection.h
  
  Index: q3ptrcollection.h
  ===================================================================
  #import "KWQCollection.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3ptrlist.h
  
  Index: q3ptrlist.h
  ===================================================================
  #import "KWQPtrList.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3ptrstack.h
  
  Index: q3ptrstack.h
  ===================================================================
  #import "KWQPtrStack.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3valuelist.h
  
  Index: q3valuelist.h
  ===================================================================
  #import "KWQValueList.h"
  
  
  
  1.1                  WebCore/ForwardingHeaders/q3valuevector.h
  
  Index: q3valuevector.h
  ===================================================================
  #import "KWQValueVector.h"
  
  
  
  1.6       +6 -6      SVGSupport/kcanvas/KCanvas.cpp
  
  Index: KCanvas.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvas.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- KCanvas.cpp	1 Sep 2005 07:32:44 -0000	1.5
  +++ KCanvas.cpp	2 Sep 2005 10:02:55 -0000	1.6
  @@ -21,7 +21,7 @@
   #include <kdebug.h>
   #include <kglobal.h>
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   #include "KCanvas.h"
   #include "KCanvasView.h"
  @@ -53,7 +53,7 @@
       KCanvasRegistry *registry;
       KRenderingDevice *renderingDevice;
   
  -    QValueList<const KCanvasView *> viewList;
  +    Q3ValueList<const KCanvasView *> viewList;
   };
   
   KCanvas::KCanvas(KRenderingDevice *device) : d(new Private(device))
  @@ -107,8 +107,8 @@
       d->canvasSize = size;
   
       // Resize all views...
  -    QValueListConstIterator<const KCanvasView *> it = d->viewList.constBegin();
  -    QValueListConstIterator<const KCanvasView *> end = d->viewList.constEnd();
  +    Q3ValueListConstIterator<const KCanvasView *> it = d->viewList.constBegin();
  +    Q3ValueListConstIterator<const KCanvasView *> end = d->viewList.constEnd();
   
       for(; it != end; ++it)
           const_cast<KCanvasView *>(*it)->canvasSizeChanged(size.width(), size.height());
  @@ -134,8 +134,8 @@
   void KCanvas::invalidate(const KCanvasItem *item)
   {
       // Invalidate the item in all views
  -    QValueListConstIterator<const KCanvasView *> it = d->viewList.constBegin();
  -    QValueListConstIterator<const KCanvasView *> end = d->viewList.constEnd();
  +    Q3ValueListConstIterator<const KCanvasView *> it = d->viewList.constBegin();
  +    Q3ValueListConstIterator<const KCanvasView *> end = d->viewList.constEnd();
   
       for(; it != end; ++it)
           (*it)->invalidateCanvasItem(item);
  
  
  
  1.5       +8 -8      SVGSupport/kcanvas/KCanvasFilters.h
  
  Index: KCanvasFilters.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasFilters.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KCanvasFilters.h	1 Sep 2005 07:32:45 -0000	1.4
  +++ KCanvasFilters.h	2 Sep 2005 10:02:55 -0000	1.5
  @@ -80,7 +80,7 @@
   
   protected:
       QRect m_filterRect;
  -    QValueList<KCanvasFilterEffect *> m_effects;
  +    Q3ValueList<KCanvasFilterEffect *> m_effects;
       bool m_filterBBoxMode;
       bool m_effectBBoxMode;
   };
  @@ -208,14 +208,14 @@
       KCColorMatrixType type() const { return m_type; }
       void setType(KCColorMatrixType type) { m_type = type; }
       
  -    QValueList<float> values() const { return m_values; }
  -    void setValues(const QValueList<float> &values) { m_values = values; };
  +    Q3ValueList<float> values() const { return m_values; }
  +    void setValues(const Q3ValueList<float> &values) { m_values = values; };
   
       QTextStream &externalRepresentation(QTextStream &) const;
   
   private:
       KCColorMatrixType m_type;
  -    QValueList<float> m_values;
  +    Q3ValueList<float> m_values;
   };
   
   typedef enum {
  @@ -231,8 +231,8 @@
        KCComponentTransferType type() const;
       void setType(KCComponentTransferType type) { m_type = type; }
       
  -    QValueList<float> tableValues() const;
  -    void setTableValues(QValueList<float> tableValues);
  +    Q3ValueList<float> tableValues() const;
  +    void setTableValues(Q3ValueList<float> tableValues);
       
       float slope() const { return m_slope; }
       void setSlope(float slope) { m_slope = slope; }
  @@ -252,7 +252,7 @@
   
   typedef struct {
       KCComponentTransferType type;
  -    QValueList<float> tableValues;
  +    Q3ValueList<float> tableValues;
       float slope;
       float intercept;
       float amplitude;
  @@ -337,7 +337,7 @@
   private:
       int m_orderX;
       int m_orderY;
  -    QValueList<float> m_kernelMatrix; // maybe should be a real matrix?
  +    Q3ValueList<float> m_kernelMatrix; // maybe should be a real matrix?
       float m_divisor;
       float m_bias;
       int m_targetX;
  
  
  
  1.4       +2 -2      SVGSupport/kcanvas/KCanvasItem.h
  
  Index: KCanvasItem.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasItem.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KCanvasItem.h	1 Sep 2005 07:32:46 -0000	1.3
  +++ KCanvasItem.h	2 Sep 2005 10:02:56 -0000	1.4
  @@ -27,7 +27,7 @@
   #include <qrect.h>
   #include <qpoint.h>
   #include <qrect.h>
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   #include <kcanvas/KCanvasTypes.h>
   
  @@ -99,7 +99,7 @@
   };
   
   // Helper data structure
  -typedef QValueList<const KCanvasItem *> KCanvasItemList;
  +typedef Q3ValueList<const KCanvasItem *> KCanvasItemList;
   
   #endif
   
  
  
  
  1.5       +3 -3      SVGSupport/kcanvas/KCanvasPath.h
  
  Index: KCanvasPath.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasPath.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KCanvasPath.h	1 Sep 2005 07:32:46 -0000	1.4
  +++ KCanvasPath.h	2 Sep 2005 10:02:56 -0000	1.5
  @@ -23,7 +23,7 @@
   #ifndef KCanvasPath_H
   #define KCanvasPath_H
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   class QTextStream;
   
  @@ -56,7 +56,7 @@
   
   QTextStream &operator<<(QTextStream &ts, const KCPathData &d);
   
  -class KCPathDataList : public QValueList<KCPathData>
  +class KCPathDataList : public Q3ValueList<KCPathData>
   {
   public:
       KCPathDataList() { }
  @@ -102,7 +102,7 @@
   
   QTextStream &operator<<(QTextStream &ts, const KCClipData &d);
   
  -class KCClipDataList : public QValueList<KCClipData>
  +class KCClipDataList : public Q3ValueList<KCClipData>
   {
   public:
       KCClipDataList() { }
  
  
  
  1.5       +2 -2      SVGSupport/kcanvas/KCanvasRegistry.cpp
  
  Index: KCanvasRegistry.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasRegistry.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KCanvasRegistry.cpp	1 Sep 2005 07:32:46 -0000	1.4
  +++ KCanvasRegistry.cpp	2 Sep 2005 10:02:56 -0000	1.5
  @@ -73,11 +73,11 @@
       } else 
       {   
           ts << endl;
  -        for (QDictIterator<KCanvasResource> it(r.m_resources); (*it); ++it) 
  +        for (Q3DictIterator<KCanvasResource> it(r.m_resources); (*it); ++it) 
           {            
               ts << "  KCanvasResource {id=\"" << it.currentKey() << "\" " << *(*it) << "}" << endl;
           }
  -        for (QDictIterator<KRenderingPaintServer> it(r.m_pservers); (*it); ++it)
  +        for (Q3DictIterator<KRenderingPaintServer> it(r.m_pservers); (*it); ++it)
           {
               ts << "  KRenderingPaintServer {id=\"" << it.currentKey() << "\" " << *(*it) <<"}" << endl;
           }
  
  
  
  1.5       +3 -3      SVGSupport/kcanvas/KCanvasRegistry.h
  
  Index: KCanvasRegistry.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasRegistry.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KCanvasRegistry.h	1 Sep 2005 07:32:46 -0000	1.4
  +++ KCanvasRegistry.h	2 Sep 2005 10:02:56 -0000	1.5
  @@ -23,7 +23,7 @@
   #ifndef KCanvasRegistry_H
   #define KCanvasRegistry_H
   
  -#include <qdict.h>
  +#include <q3dict.h>
   #include <qstring.h>
   
   #include <kcanvas/KCanvasResources.h>
  @@ -50,8 +50,8 @@
       friend QTextStream &operator<<(QTextStream &, const KCanvasRegistry &);
       
   private:
  -    QDict<KCanvasResource> m_resources;
  -    QDict<KRenderingPaintServer> m_pservers;
  +    Q3Dict<KCanvasResource> m_resources;
  +    Q3Dict<KRenderingPaintServer> m_pservers;
   };
   
   QTextStream &operator<<(QTextStream &, const KCanvasRegistry &);
  
  
  
  1.5       +1 -1      SVGSupport/kcanvas/KCanvasResources.h
  
  Index: KCanvasResources.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasResources.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KCanvasResources.h	1 Sep 2005 07:32:47 -0000	1.4
  +++ KCanvasResources.h	2 Sep 2005 10:02:56 -0000	1.5
  @@ -24,7 +24,7 @@
   #define KCanvasResources_H
   
   #include <qstring.h>
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   #include <kcanvas/KCanvasItem.h>
   #include <kcanvas/KCanvasPath.h>
  
  
  
  1.3       +7 -7      SVGSupport/kcanvas/KCanvasTreeDebug.h
  
  Index: KCanvasTreeDebug.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasTreeDebug.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- KCanvasTreeDebug.h	1 Sep 2005 04:39:35 -0000	1.2
  +++ KCanvasTreeDebug.h	2 Sep 2005 10:02:56 -0000	1.3
  @@ -25,7 +25,7 @@
   
   #include <qstring.h>
   #include <qtextstream.h>
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   class KCanvasMatrix;
   class QRect;
  @@ -51,11 +51,11 @@
   QTextStream &operator<<(QTextStream &ts, const QStringList &l);
       
   template<typename Item>
  -QTextStream &operator<<(QTextStream &ts, const QValueList<Item*> &l)
  +QTextStream &operator<<(QTextStream &ts, const Q3ValueList<Item*> &l)
   {
       ts << "[";
  -    typename QValueList<Item*>::ConstIterator it = l.begin();
  -    typename QValueList<Item*>::ConstIterator it_e = l.end();
  +    typename Q3ValueList<Item*>::ConstIterator it = l.begin();
  +    typename Q3ValueList<Item*>::ConstIterator it_e = l.end();
       while (it != it_e)
       {
           ts << *(*it);
  @@ -68,11 +68,11 @@
   }
   
   template<typename Item>
  -QTextStream &operator<<(QTextStream &ts, const QValueList<Item> &l)
  +QTextStream &operator<<(QTextStream &ts, const Q3ValueList<Item> &l)
   {
       ts << "[";
  -    typename QValueList<Item>::ConstIterator it = l.begin();
  -    typename QValueList<Item>::ConstIterator it_e = l.end();
  +    typename Q3ValueList<Item>::ConstIterator it = l.begin();
  +    typename Q3ValueList<Item>::ConstIterator it_e = l.end();
       while (it != it_e)
       {
           ts << *it;
  
  
  
  1.4       +3 -3      SVGSupport/kcanvas/KCanvasTypes.h
  
  Index: KCanvasTypes.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasTypes.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KCanvasTypes.h	1 Sep 2005 07:32:47 -0000	1.3
  +++ KCanvasTypes.h	2 Sep 2005 10:02:56 -0000	1.4
  @@ -23,7 +23,7 @@
   #ifndef KCanvasTypes_H
   #define KCanvasTypes_H
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   // Some default constants
   
  @@ -35,9 +35,9 @@
   
   };
   
  -typedef QPtrList<KCanvasPrivateUserData> KCanvasUserDataList;
  +typedef Q3PtrList<KCanvasPrivateUserData> KCanvasUserDataList;
   #else
  -typedef QPtrList<void> KCanvasUserDataList;
  +typedef Q3PtrList<void> KCanvasUserDataList;
   #endif
   
   // aka "what to draw"
  
  
  
  1.4       +1 -1      SVGSupport/kcanvas/KCanvasView.cpp
  
  Index: KCanvasView.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasView.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KCanvasView.cpp	1 Sep 2005 07:32:47 -0000	1.3
  +++ KCanvasView.cpp	2 Sep 2005 10:02:56 -0000	1.4
  @@ -22,7 +22,7 @@
   #include <kglobal.h>
   
   #include <qregion.h>
  -#include <qintdict.h>
  +#include <q3intdict.h>
   
   #include "KCanvas.h"
   #include "KCanvasItem.h"
  
  
  
  1.4       +2 -2      SVGSupport/kcanvas/device/KRenderingDevice.h
  
  Index: KRenderingDevice.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/device/KRenderingDevice.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KRenderingDevice.h	1 Sep 2005 07:32:50 -0000	1.3
  +++ KRenderingDevice.h	2 Sep 2005 10:02:58 -0000	1.4
  @@ -25,7 +25,7 @@
   
   #include <qcolor.h>
   #include <qobject.h>
  -#include <qptrstack.h>
  +#include <q3ptrstack.h>
   
   #include <kcanvas/KCanvasTypes.h>
   #include <kcanvas/KCanvasFilters.h>
  @@ -97,7 +97,7 @@
   
   private:
       KCanvasUserData m_currentPath;
  -    QPtrStack<KRenderingDeviceContext> m_contextStack;
  +    Q3PtrStack<KRenderingDeviceContext> m_contextStack;
   };
   
   #endif
  
  
  
  1.4       +4 -4      SVGSupport/kcanvas/device/KRenderingDeviceFactory.cpp
  
  Index: KRenderingDeviceFactory.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/device/KRenderingDeviceFactory.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KRenderingDeviceFactory.cpp	1 Sep 2005 07:32:50 -0000	1.3
  +++ KRenderingDeviceFactory.cpp	2 Sep 2005 10:02:58 -0000	1.4
  @@ -59,7 +59,7 @@
   
   KRenderingDevice *KRenderingDeviceFactory::request(const QString &device) const
   {
  -    QValueList<KService::Ptr> traderList = KTrader::self()->query("KCanvas/Device", "(Type == 'Service')");
  +    Q3ValueList<KService::Ptr> traderList = KTrader::self()->query("KCanvas/Device", "(Type == 'Service')");
       KTrader::OfferList::Iterator it(traderList.begin());
       for( ; it != traderList.end(); ++it)
       {
  @@ -83,11 +83,11 @@
       return 0;
   }
   
  -const QValueList<KRenderingDeviceInfo> KRenderingDeviceFactory::deviceList() const
  +const Q3ValueList<KRenderingDeviceInfo> KRenderingDeviceFactory::deviceList() const
   {
  -    QValueList<KRenderingDeviceInfo> list;
  +    Q3ValueList<KRenderingDeviceInfo> list;
       
  -    QValueList<KService::Ptr> traderList = KTrader::self()->query("KCanvas/Device", "(Type == 'Service')");
  +    Q3ValueList<KService::Ptr> traderList = KTrader::self()->query("KCanvas/Device", "(Type == 'Service')");
       KTrader::OfferList::Iterator it(traderList.begin());
       for( ; it != traderList.end(); ++it)
       {
  
  
  
  1.4       +2 -2      SVGSupport/kcanvas/device/KRenderingDeviceFactory.h
  
  Index: KRenderingDeviceFactory.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/device/KRenderingDeviceFactory.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KRenderingDeviceFactory.h	1 Sep 2005 07:32:50 -0000	1.3
  +++ KRenderingDeviceFactory.h	2 Sep 2005 10:02:58 -0000	1.4
  @@ -25,7 +25,7 @@
   
   #include <kinstance.h>
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   class KCanvas;
   class KCanvasTarget;
  @@ -48,7 +48,7 @@
       KRenderingDevice *request(const QString &device) const;
       
       // Request a list of all available rendering devices
  -    const QValueList<KRenderingDeviceInfo> deviceList() const;
  +    const Q3ValueList<KRenderingDeviceInfo> deviceList() const;
   
   private:
       static KInstance *s_instance;
  
  
  
  1.5       +1 -1      SVGSupport/kcanvas/device/KRenderingPaintServerGradient.cpp
  
  Index: KRenderingPaintServerGradient.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/device/KRenderingPaintServerGradient.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KRenderingPaintServerGradient.cpp	1 Sep 2005 07:32:50 -0000	1.4
  +++ KRenderingPaintServerGradient.cpp	2 Sep 2005 10:02:58 -0000	1.5
  @@ -59,7 +59,7 @@
       sort();
   }
   
  -int KCSortedGradientStopList::compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2)
  +int KCSortedGradientStopList::compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2)
   {
       KCGradientOffsetPair *pair1 = static_cast<KCGradientOffsetPair *>(item1);
       KCGradientOffsetPair *pair2 = static_cast<KCGradientOffsetPair *>(item2);
  
  
  
  1.5       +4 -4      SVGSupport/kcanvas/device/KRenderingPaintServerGradient.h
  
  Index: KRenderingPaintServerGradient.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/device/KRenderingPaintServerGradient.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KRenderingPaintServerGradient.h	1 Sep 2005 07:32:50 -0000	1.4
  +++ KRenderingPaintServerGradient.h	2 Sep 2005 10:02:58 -0000	1.5
  @@ -24,7 +24,7 @@
   #define KRenderingPaintServerGradient_H
   
   #include <qcolor.h>
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kcanvas/KCanvasResources.h>
   #include <kcanvas/device/KRenderingPaintServer.h>
  @@ -44,17 +44,17 @@
       QColor color;
   };
   
  -class KCSortedGradientStopList : public QPtrList<KCGradientOffsetPair>
  +class KCSortedGradientStopList : public Q3PtrList<KCGradientOffsetPair>
   {
   public:
       KCSortedGradientStopList();
       void addStop(float offset, const QColor &color);
   
  -    typedef QPtrListIterator<KCGradientOffsetPair> Iterator;
  +    typedef Q3PtrListIterator<KCGradientOffsetPair> Iterator;
   
       
   protected:
  -    virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2);
  +    virtual int compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2);
   private:
       friend QTextStream &operator<<(QTextStream &, const KCSortedGradientStopList &);
   };
  
  
  
  1.5       +2 -2      SVGSupport/kcanvas/device/KRenderingStyle.h
  
  Index: KRenderingStyle.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kcanvas/device/KRenderingStyle.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KRenderingStyle.h	1 Sep 2005 07:32:52 -0000	1.4
  +++ KRenderingStyle.h	2 Sep 2005 10:02:58 -0000	1.5
  @@ -23,7 +23,7 @@
   #ifndef KRenderingStyle_H
   #define KRenderingStyle_H
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   #include <qstringlist.h>
   
   // Enumerations
  @@ -54,7 +54,7 @@
   } KCImageRendering;
   
   // Special types
  -typedef QValueList<float> KCDashArray;
  +typedef Q3ValueList<float> KCDashArray;
   
   class KCanvasMatrix;
   class KCanvasFilter;
  
  
  
  1.4       +4 -4      SVGSupport/kdom/KDOMSettings.cpp
  
  Index: KDOMSettings.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/KDOMSettings.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KDOMSettings.cpp	1 Sep 2005 07:32:56 -0000	1.3
  +++ KDOMSettings.cpp	2 Sep 2005 10:02:59 -0000	1.4
  @@ -31,7 +31,7 @@
   
   #include <qpair.h>
   #include <qregexp.h>
  -#include <qvaluevector.h>
  +#include <q3valuevector.h>
   #include <qfontdatabase.h>
   
   #include "KDOMSettings.h"
  @@ -97,8 +97,8 @@
   
       PolicyMap domainPolicy;
   
  -    QValueVector<QRegExp> adFilters;
  -    QValueList< QPair< QString, QChar > > fallbackAccessKeysAssignments;
  +    Q3ValueVector<QRegExp> adFilters;
  +    Q3ValueList< QPair< QString, QChar > > fallbackAccessKeysAssignments;
   
       // Flags
       bool enforceCharset : 1;
  @@ -646,7 +646,7 @@
       {
           if(!url.startsWith(QString::fromLatin1("data:")))
           {
  -            QValueVector<QRegExp>::iterator it;
  +            Q3ValueVector<QRegExp>::iterator it;
               for(it = d->adFilters.begin(); it != d->adFilters.end(); ++it)
               {
                   if((*it).search(url) != -1)
  
  
  
  1.4       +8 -8      SVGSupport/kdom/cache/KDOMCache.cpp
  
  Index: KDOMCache.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCache.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KDOMCache.cpp	1 Sep 2005 07:33:00 -0000	1.3
  +++ KDOMCache.cpp	2 Sep 2005 10:02:59 -0000	1.4
  @@ -46,9 +46,9 @@
   #define KDOM_CACHE_DEFAULT_SIZE 2146304 // 2096 * 1024
   
   Loader *Cache::s_loader = 0;
  -QDict<CachedObject> *Cache::s_objectDict = 0;
  -QPtrList<CachedObject> *Cache::s_freeList = 0;
  -QPtrList<DocumentLoader> *Cache::s_docLoaderList = 0;
  +Q3Dict<CachedObject> *Cache::s_objectDict = 0;
  +Q3PtrList<CachedObject> *Cache::s_freeList = 0;
  +Q3PtrList<DocumentLoader> *Cache::s_docLoaderList = 0;
   
   QPixmap *Cache::nullPixmap;
   QPixmap *Cache::brokenPixmap;
  @@ -63,14 +63,14 @@
           s_loader = new Loader();
   
       if(!s_objectDict)
  -        s_objectDict = new QDict<CachedObject>(KDOM_CACHE_DICT_SIZE, true);
  +        s_objectDict = new Q3Dict<CachedObject>(KDOM_CACHE_DICT_SIZE, true);
   
       if(!s_docLoaderList)
  -        s_docLoaderList = new QPtrList<DocumentLoader>;
  +        s_docLoaderList = new Q3PtrList<DocumentLoader>;
   
       if(!s_freeList)
       {
  -        s_freeList = new QPtrList<CachedObject>;
  +        s_freeList = new Q3PtrList<CachedObject>;
           s_freeList->setAutoDelete(true);
       }
       
  @@ -140,7 +140,7 @@
   
   bool Cache::hasPending(CachedObject::Type type)
   {
  -    QDictIterator<CachedObject> it(*s_objectDict);
  +    Q3DictIterator<CachedObject> it(*s_objectDict);
       for(it.toFirst(); it.current(); ++it)
       {
           if(it.current()->type() == type &&
  @@ -166,7 +166,7 @@
       int stylesheets = 0;
       int documents = 0;
   
  -    QDictIterator<CachedObject> it(*s_objectDict);
  +    Q3DictIterator<CachedObject> it(*s_objectDict);
       for(it.toFirst(); it.current(); ++it)
       {
           o = it.current();
  
  
  
  1.4       +5 -5      SVGSupport/kdom/cache/KDOMCache.h
  
  Index: KDOMCache.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCache.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KDOMCache.h	1 Sep 2005 07:33:00 -0000	1.3
  +++ KDOMCache.h	2 Sep 2005 10:03:00 -0000	1.4
  @@ -28,8 +28,8 @@
   #ifndef KDOM_Cache_H
   #define KDOM_Cache_H
   
  -#include <qdict.h>
  -#include <qptrlist.h>
  +#include <q3dict.h>
  +#include <q3ptrlist.h>
   #include <qpixmap.h>
   
   #include "KDOMCachedObject.h"
  @@ -88,9 +88,9 @@
   
           static Loader *s_loader;
   
  -        static QDict<CachedObject> *s_objectDict; // cache
  -        static QPtrList<CachedObject> *s_freeList; // freelist
  -        static QPtrList<DocumentLoader> *s_docLoaderList; // docloader;
  +        static Q3Dict<CachedObject> *s_objectDict; // cache
  +        static Q3PtrList<CachedObject> *s_freeList; // freelist
  +        static Q3PtrList<DocumentLoader> *s_docLoaderList; // docloader;
   
       private: // Used by 'DocumentLoader' exclusively
           template<typename CachedObjectType, enum CachedObject::Type CachedType>
  
  
  
  1.4       +1 -1      SVGSupport/kdom/cache/KDOMCacheHelper.h
  
  Index: KDOMCacheHelper.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCacheHelper.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KDOMCacheHelper.h	1 Sep 2005 07:33:00 -0000	1.3
  +++ KDOMCacheHelper.h	2 Sep 2005 10:03:00 -0000	1.4
  @@ -29,7 +29,7 @@
   #define KDOM_CacheHelper_H
   
   #include <qptrdict.h>
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kdom/cache/KDOMCachedObject.h>
   
  
  
  
  1.6       +2 -2      SVGSupport/kdom/cache/KDOMLoader.cpp
  
  Index: KDOMLoader.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMLoader.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- KDOMLoader.cpp	1 Sep 2005 09:39:01 -0000	1.5
  +++ KDOMLoader.cpp	2 Sep 2005 10:03:00 -0000	1.6
  @@ -266,7 +266,7 @@
   {
       int res = 0;
   
  -    QPtrListIterator<Request> pIt(m_requestsPending);
  +    Q3PtrListIterator<Request> pIt(m_requestsPending);
       for(; pIt.current(); ++pIt)
       {
           if(pIt.current()->docLoader == docLoader)
  @@ -285,7 +285,7 @@
   
   void Loader::cancelRequests(DocumentLoader *docLoader)
   {
  -    QPtrListIterator<Request> pIt(m_requestsPending);
  +    Q3PtrListIterator<Request> pIt(m_requestsPending);
       while(pIt.current())
       {
           if(pIt.current()->docLoader == docLoader)
  
  
  
  1.5       +1 -1      SVGSupport/kdom/cache/KDOMLoader.h
  
  Index: KDOMLoader.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMLoader.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KDOMLoader.h	1 Sep 2005 07:33:02 -0000	1.4
  +++ KDOMLoader.h	2 Sep 2005 10:03:00 -0000	1.5
  @@ -148,7 +148,7 @@
           void servePendingRequests();
   
       protected:
  -        QPtrList<Request> m_requestsPending;
  +        Q3PtrList<Request> m_requestsPending;
           QPtrDict<Request> m_requestsLoading;
   
           QTimer m_timer;
  
  
  
  1.5       +2 -2      SVGSupport/kdom/core/DOMList.h
  
  Index: DOMList.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/core/DOMList.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DOMList.h	1 Sep 2005 07:33:33 -0000	1.4
  +++ DOMList.h	2 Sep 2005 10:03:01 -0000	1.5
  @@ -23,7 +23,7 @@
   #ifndef KDOM_DOMList_H
   #define KDOM_DOMList_H
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   #include <kdom/Shared.h>
   
   namespace KDOM
  @@ -116,7 +116,7 @@
           }
   
       private:
  -        QPtrList<T> m_impl;
  +        Q3PtrList<T> m_impl;
       };
   };
   
  
  
  
  1.7       +5 -5      SVGSupport/kdom/core/DocumentImpl.cpp
  
  Index: DocumentImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/core/DocumentImpl.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DocumentImpl.cpp	1 Sep 2005 09:39:02 -0000	1.6
  +++ DocumentImpl.cpp	2 Sep 2005 10:03:01 -0000	1.7
  @@ -30,8 +30,8 @@
   
   #include <klocale.h>
   
  -#include <qptrstack.h>
  -#include <qpaintdevicemetrics.h>
  +#include <q3ptrstack.h>
  +#include <q3paintdevicemetrics.h>
   
   #include "kdom.h"
   #include <kdom/ecma/Ecma.h>
  @@ -679,7 +679,7 @@
       if(elementId)
           elementId->ref();
   
  -    QPtrStack<NodeImpl> nodeStack;
  +    Q3PtrStack<NodeImpl> nodeStack;
       NodeImpl *current = firstChild();
   
       while(1)
  @@ -836,7 +836,7 @@
           m_paintDevice = dev;
           
           delete m_paintDeviceMetrics;
  -        m_paintDeviceMetrics = new QPaintDeviceMetrics(dev);
  +        m_paintDeviceMetrics = new Q3PaintDeviceMetrics(dev);
       }
   }
   
  @@ -874,7 +874,7 @@
           }
           case NodeImpl::NamespaceId:
           {
  -            // ### Id == 0 can't be used with ((void *) int) based QDicts...
  +            // ### Id == 0 can't be used with ((void *) int) based Q3Dicts...
               if(!strcasecmp(DOMString(name), DOMString(defaultNS())))
                   return 0;
       
  
  
  
  1.6       +9 -9      SVGSupport/kdom/core/DocumentImpl.h
  
  Index: DocumentImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/core/DocumentImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DocumentImpl.h	1 Sep 2005 09:39:02 -0000	1.5
  +++ DocumentImpl.h	2 Sep 2005 10:03:01 -0000	1.6
  @@ -31,8 +31,8 @@
   
   #include <kurl.h>
   
  -#include <qdict.h>
  -#include <qintdict.h>
  +#include <q3dict.h>
  +#include <q3intdict.h>
   #include <qstringlist.h>
   
   #include <kdom/core/NodeImpl.h>
  @@ -47,7 +47,7 @@
   #include <kdom/xpath/XPathEvaluatorImpl.h>
   
   class QPaintDevice;
  -class QPaintDeviceMetrics;
  +class Q3PaintDeviceMetrics;
   
   namespace KDOM
   {
  @@ -197,7 +197,7 @@
           void setView(KDOMView *view) { m_view = view; }
           KDOMPart *part() const;
   
  -        QPaintDeviceMetrics *paintDeviceMetrics() { return m_paintDeviceMetrics; }
  +        Q3PaintDeviceMetrics *paintDeviceMetrics() { return m_paintDeviceMetrics; }
           QPaintDevice *paintDevice() const { return m_paintDevice; }
           void setPaintDevice(QPaintDevice *dev);
   
  @@ -251,22 +251,22 @@
               IdNameMapping(unsigned short start) : idStart(start), count(0) { }
               ~IdNameMapping()
               {
  -                QIntDictIterator<DOMStringImpl> it(names);
  +                Q3IntDictIterator<DOMStringImpl> it(names);
                   for(; it.current() ; ++it)
                       (it.current())->deref();
               }
   
               unsigned short idStart;
               unsigned short count;
  -            QIntDict<DOMStringImpl> names;
  -            QDict<NodeImpl::Id> ids;
  +            Q3IntDict<DOMStringImpl> names;
  +            Q3Dict<NodeImpl::Id> ids;
           };
   
           IdNameMapping *m_attrMap;
           IdNameMapping *m_elementMap;
           IdNameMapping *m_namespaceMap;
   
  -        QPtrList<NodeIteratorImpl> m_nodeIterators;
  +        Q3PtrList<NodeIteratorImpl> m_nodeIterators;
   
           virtual DOMStringImpl *defaultNS() const;
   
  @@ -306,7 +306,7 @@
           KDOMView *m_view;
   
           QPaintDevice *m_paintDevice;
  -        QPaintDeviceMetrics *m_paintDeviceMetrics;
  +        Q3PaintDeviceMetrics *m_paintDeviceMetrics;
   
           // Track the number of currently loading top-level stylesheets.  Sheets
           // loaded using the @import directive are not included in this count.
  
  
  
  1.5       +2 -2      SVGSupport/kdom/core/NamedNodeMapImpl.cpp
  
  Index: NamedNodeMapImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/core/NamedNodeMapImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NamedNodeMapImpl.cpp	1 Sep 2005 07:33:36 -0000	1.4
  +++ NamedNodeMapImpl.cpp	2 Sep 2005 10:03:01 -0000	1.5
  @@ -44,7 +44,7 @@
   RONamedNodeMapImpl::RONamedNodeMapImpl(DocumentPtr *doc)
   : NamedNodeMapImpl(), m_doc(doc)
   {
  -    m_map = new QPtrList<NodeImpl>;
  +    m_map = new Q3PtrList<NodeImpl>;
   }
   
   RONamedNodeMapImpl::~RONamedNodeMapImpl()
  @@ -94,7 +94,7 @@
   {
       // TODO : id mechanism doesnt work,
       // reverting to old system
  -    QPtrListIterator<NodeImpl> it(*m_map);
  +    Q3PtrListIterator<NodeImpl> it(*m_map);
       for(; it.current(); ++it)
       {
           if(DOMString(it.current()->nodeName()) == DOMString(name))
  
  
  
  1.6       +2 -2      SVGSupport/kdom/core/NamedNodeMapImpl.h
  
  Index: NamedNodeMapImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/core/NamedNodeMapImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NamedNodeMapImpl.h	1 Sep 2005 09:39:02 -0000	1.5
  +++ NamedNodeMapImpl.h	2 Sep 2005 10:03:01 -0000	1.6
  @@ -29,7 +29,7 @@
   #ifndef KDOM_NamedNodeMapImpl_H
   #define KDOM_NamedNodeMapImpl_H
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kdom/Shared.h>
   #include <kdom/core/NodeImpl.h>
  @@ -83,7 +83,7 @@
           void addNode(NodeImpl *n);
   
       protected:
  -        QPtrList<NodeImpl> *m_map;
  +        Q3PtrList<NodeImpl> *m_map;
           DocumentPtr *m_doc;
       };
   };
  
  
  
  1.5       +1 -1      SVGSupport/kdom/core/NodeImpl.cpp
  
  Index: NodeImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/core/NodeImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NodeImpl.cpp	1 Sep 2005 07:33:36 -0000	1.4
  +++ NodeImpl.cpp	2 Sep 2005 10:03:01 -0000	1.5
  @@ -1302,7 +1302,7 @@
          nodeType() == ENTITY_NODE || nodeType() == NOTATION_NODE)
           return DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
   
  -    QPtrList<NodeImpl> containers;
  +    Q3PtrList<NodeImpl> containers;
       NodeImpl *container = const_cast<NodeImpl *>(this);
       while(container)
       {
  
  
  
  1.5       +9 -9      SVGSupport/kdom/core/TextImpl.cpp
  
  Index: TextImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/core/TextImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TextImpl.cpp	1 Sep 2005 07:33:38 -0000	1.4
  +++ TextImpl.cpp	2 Sep 2005 10:03:01 -0000	1.5
  @@ -90,15 +90,15 @@
   {
       DOMStringImpl *ret = new DOMStringImpl();
   
  -    QPtrList<NodeImpl> nodes = logicallyAdjacentTextNodes();
  -    QPtrListIterator<NodeImpl> it(nodes);
  +    Q3PtrList<NodeImpl> nodes = logicallyAdjacentTextNodes();
  +    Q3PtrListIterator<NodeImpl> it(nodes);
       for(;it.current(); ++it)
           ret->append((*it)->nodeValue());
   
       return ret;
   }
   
  -bool TextImpl::checkChildren(NodeImpl *_node, const QPtrList<NodeImpl> &nodes) const
  +bool TextImpl::checkChildren(NodeImpl *_node, const Q3PtrList<NodeImpl> &nodes) const
   {
       for(NodeImpl *n = _node->firstChild();n;n = n->nextSibling())
       {
  @@ -118,9 +118,9 @@
       if(isReadOnly() && content && content->length() > 0)
           replacement = ownerDocument()->createTextNode(content);
   
  -    QPtrList<NodeImpl> nodes = logicallyAdjacentTextNodes();
  -    QPtrList<NodeImpl> removables;
  -    QPtrListIterator<NodeImpl> it(nodes);
  +    Q3PtrList<NodeImpl> nodes = logicallyAdjacentTextNodes();
  +    Q3PtrList<NodeImpl> removables;
  +    Q3PtrListIterator<NodeImpl> it(nodes);
       for(;it.current(); ++it)
       {
           NodeImpl *n = (*it);
  @@ -140,7 +140,7 @@
           }
       }
   
  -    QPtrListIterator<NodeImpl> it2(removables);
  +    Q3PtrListIterator<NodeImpl> it2(removables);
       for(;it2.current(); ++it2)
       {
           NodeImpl *removable = (*it2);
  @@ -166,7 +166,7 @@
       return this;
   }
   
  -QPtrList<NodeImpl> TextImpl::logicallyAdjacentTextNodes() const
  +Q3PtrList<NodeImpl> TextImpl::logicallyAdjacentTextNodes() const
   {
       NodeImpl *n = const_cast<TextImpl *>(this);
       bool go = false;
  @@ -197,7 +197,7 @@
           n = previous;
       }
   
  -    QPtrList<NodeImpl> ret;
  +    Q3PtrList<NodeImpl> ret;
       go = true;
       while(true)
       {
  
  
  
  1.6       +2 -2      SVGSupport/kdom/core/TextImpl.h
  
  Index: TextImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/core/TextImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TextImpl.h	1 Sep 2005 09:39:02 -0000	1.5
  +++ TextImpl.h	2 Sep 2005 10:03:01 -0000	1.6
  @@ -46,8 +46,8 @@
           virtual NodeImpl *cloneNode(bool deep, DocumentPtr *doc) const;
   
       protected:
  -        QPtrList<NodeImpl> logicallyAdjacentTextNodes() const;
  -        bool checkChildren(NodeImpl *node, const QPtrList<NodeImpl> &removables) const;
  +        Q3PtrList<NodeImpl> logicallyAdjacentTextNodes() const;
  +        bool checkChildren(NodeImpl *node, const Q3PtrList<NodeImpl> &removables) const;
       };
   };
   
  
  
  
  1.6       +3 -3      SVGSupport/kdom/css/CSSPrimitiveValueImpl.cpp
  
  Index: CSSPrimitiveValueImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSPrimitiveValueImpl.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSPrimitiveValueImpl.cpp	1 Sep 2005 09:39:05 -0000	1.5
  +++ CSSPrimitiveValueImpl.cpp	2 Sep 2005 10:03:03 -0000	1.6
  @@ -22,7 +22,7 @@
   
   #include <qregexp.h>
   #include <qfontmetrics.h>
  -#include <qpaintdevicemetrics.h>
  +#include <q3paintdevicemetrics.h>
   
   #include "RectImpl.h"
   #include <kdom/css/CSSHelper.h>
  @@ -208,7 +208,7 @@
       return new RGBColorImpl(m_interface, getQRGBColorValue());
   }
   
  -int CSSPrimitiveValueImpl::computeLength(RenderStyle *style, QPaintDeviceMetrics *devMetrics)
  +int CSSPrimitiveValueImpl::computeLength(RenderStyle *style, Q3PaintDeviceMetrics *devMetrics)
   {
       double result = computeLengthFloat(style, devMetrics);
   
  @@ -218,7 +218,7 @@
       return intResult;
   }
   
  -double CSSPrimitiveValueImpl::computeLengthFloat(RenderStyle *style, QPaintDeviceMetrics *devMetrics)
  +double CSSPrimitiveValueImpl::computeLengthFloat(RenderStyle *style, Q3PaintDeviceMetrics *devMetrics)
   {
       unsigned short type = primitiveType();
   
  
  
  
  1.6       +3 -3      SVGSupport/kdom/css/CSSPrimitiveValueImpl.h
  
  Index: CSSPrimitiveValueImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSPrimitiveValueImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSPrimitiveValueImpl.h	1 Sep 2005 09:39:05 -0000	1.5
  +++ CSSPrimitiveValueImpl.h	2 Sep 2005 10:03:03 -0000	1.6
  @@ -28,7 +28,7 @@
   #include <kdom/css/CSSValueImpl.h>
   
   #include <qcolor.h>
  -class QPaintDeviceMetrics;
  +class Q3PaintDeviceMetrics;
   
   namespace KDOM
   {
  @@ -72,8 +72,8 @@
            * this is screen/printer dependent, so we probably need a config option for this,
            * and some tool to calibrate.
            */
  -        int computeLength(RenderStyle *style, QPaintDeviceMetrics *devMetrics);
  -        double computeLengthFloat(RenderStyle *style, QPaintDeviceMetrics *devMetrics);
  +        int computeLength(RenderStyle *style, Q3PaintDeviceMetrics *devMetrics);
  +        double computeLengthFloat(RenderStyle *style, Q3PaintDeviceMetrics *devMetrics);
   
           // use with care!
           double floatValue(unsigned short /* unitType */) const { return m_value.num; }
  
  
  
  1.4       +2 -2      SVGSupport/kdom/css/CSSRuleListImpl.h
  
  Index: CSSRuleListImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSRuleListImpl.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CSSRuleListImpl.h	1 Sep 2005 07:33:07 -0000	1.3
  +++ CSSRuleListImpl.h	2 Sep 2005 10:03:03 -0000	1.4
  @@ -25,7 +25,7 @@
   
   #include <kdom/Shared.h>
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   namespace KDOM
   {
  @@ -46,7 +46,7 @@
           void append(CSSRuleImpl *rule);
   
       protected:
  -        QPtrList<CSSRuleImpl> m_lstCSSRules;
  +        Q3PtrList<CSSRuleImpl> m_lstCSSRules;
       };
   };
   
  
  
  
  1.6       +11 -11    SVGSupport/kdom/css/CSSStyleDeclarationImpl.cpp
  
  Index: CSSStyleDeclarationImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSStyleDeclarationImpl.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSStyleDeclarationImpl.cpp	1 Sep 2005 09:39:05 -0000	1.5
  +++ CSSStyleDeclarationImpl.cpp	2 Sep 2005 10:03:03 -0000	1.6
  @@ -41,7 +41,7 @@
       m_interface = interface;
   }
   
  -CSSStyleDeclarationImpl::CSSStyleDeclarationImpl(CDFInterface *interface, CSSRuleImpl *parent, QPtrList<CSSProperty> *lstValues)
  +CSSStyleDeclarationImpl::CSSStyleDeclarationImpl(CDFInterface *interface, CSSRuleImpl *parent, Q3PtrList<CSSProperty> *lstValues)
   : StyleBaseImpl(parent)
   {
       m_node = 0;
  @@ -65,10 +65,10 @@
   
       if(o.m_lstValues)
       {
  -        m_lstValues = new QPtrList<CSSProperty>();
  +        m_lstValues = new Q3PtrList<CSSProperty>();
           m_lstValues->setAutoDelete(true);
   
  -        QPtrListIterator<CSSProperty> lstValuesIt(*o.m_lstValues);
  +        Q3PtrListIterator<CSSProperty> lstValuesIt(*o.m_lstValues);
           for(lstValuesIt.toFirst(); lstValuesIt.current(); ++lstValuesIt)
               m_lstValues->append(new CSSProperty(*lstValuesIt.current()));
       }
  @@ -83,7 +83,7 @@
   
       DOMStringImpl *result = new DOMStringImpl();
   
  -    QPtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
  +    Q3PtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
           
       CSSProperty *current;
       for(lstValuesIt.toFirst(); (current = lstValuesIt.current()); ++lstValuesIt)
  @@ -98,7 +98,7 @@
           m_lstValues->clear();
       else
       {
  -        m_lstValues = new QPtrList<CSSProperty>();
  +        m_lstValues = new Q3PtrList<CSSProperty>();
           m_lstValues->setAutoDelete(true);
       }
   
  @@ -291,7 +291,7 @@
       if(!m_lstValues)
           return 0;
   
  -    QPtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
  +    Q3PtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
       CSSProperty *current;
       for(lstValuesIt.toLast(); (current = lstValuesIt.current()); --lstValuesIt)
       {
  @@ -331,7 +331,7 @@
   
       DOMStringImpl *value = 0;
   
  -    QPtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
  +    Q3PtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
       CSSProperty *current;
       for(lstValuesIt.toLast(); (current = lstValuesIt.current()); --lstValuesIt)
       {
  @@ -352,7 +352,7 @@
       if(!m_lstValues)
           return false;
   
  -    QPtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
  +    Q3PtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
           
       CSSProperty *current;
       for(lstValuesIt.toFirst(); (current = lstValuesIt.current()); ++lstValuesIt)
  @@ -382,7 +382,7 @@
   {
       if(!m_lstValues)
       {
  -        m_lstValues = new QPtrList<CSSProperty>();
  +        m_lstValues = new Q3PtrList<CSSProperty>();
           m_lstValues->setAutoDelete(true);
       }
   
  @@ -397,7 +397,7 @@
   {
       if(!m_lstValues)
       {
  -        m_lstValues = new QPtrList<CSSProperty>();
  +        m_lstValues = new Q3PtrList<CSSProperty>();
           m_lstValues->setAutoDelete(true);
       }
   
  @@ -439,7 +439,7 @@
   {
       if(!m_lstValues)
       {
  -        m_lstValues = new QPtrList<CSSProperty>();
  +        m_lstValues = new Q3PtrList<CSSProperty>();
           m_lstValues->setAutoDelete(true);
       }
   
  
  
  
  1.6       +4 -4      SVGSupport/kdom/css/CSSStyleDeclarationImpl.h
  
  Index: CSSStyleDeclarationImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSStyleDeclarationImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSStyleDeclarationImpl.h	1 Sep 2005 09:39:05 -0000	1.5
  +++ CSSStyleDeclarationImpl.h	2 Sep 2005 10:03:03 -0000	1.6
  @@ -23,7 +23,7 @@
   #ifndef KDOM_CSSStyleDeclarationImpl_H
   #define KDOM_CSSStyleDeclarationImpl_H
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kdom/css/StyleBaseImpl.h>
   
  @@ -39,7 +39,7 @@
       {
       public:
           CSSStyleDeclarationImpl(CDFInterface *interface, CSSRuleImpl *parentRule);
  -        CSSStyleDeclarationImpl(CDFInterface *interface, CSSRuleImpl *parentRule, QPtrList<CSSProperty> *lstValues);
  +        CSSStyleDeclarationImpl(CDFInterface *interface, CSSRuleImpl *parentRule, Q3PtrList<CSSProperty> *lstValues);
           virtual ~CSSStyleDeclarationImpl();
   
           CSSStyleDeclarationImpl& operator=(const CSSStyleDeclarationImpl &);
  @@ -76,7 +76,7 @@
           void setNode(NodeImpl *node) { m_node = node; }
           
           CDFInterface *interface() const { return m_interface; }
  -        QPtrList<CSSProperty> *values() const { return m_lstValues; }
  +        Q3PtrList<CSSProperty> *values() const { return m_lstValues; }
   
           virtual void setChanged();
   
  @@ -91,7 +91,7 @@
           DOMStringImpl *get4Values(const int *properties) const;
   
       protected:
  -        QPtrList<CSSProperty> *m_lstValues;
  +        Q3PtrList<CSSProperty> *m_lstValues;
           CDFInterface *m_interface;
           NodeImpl *m_node;
       };
  
  
  
  1.5       +1 -1      SVGSupport/kdom/css/CSSStyleRuleImpl.cpp
  
  Index: CSSStyleRuleImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSStyleRuleImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CSSStyleRuleImpl.cpp	1 Sep 2005 07:33:08 -0000	1.4
  +++ CSSStyleRuleImpl.cpp	2 Sep 2005 10:03:03 -0000	1.5
  @@ -74,7 +74,7 @@
       return m_style;
   }
   
  -void CSSStyleRuleImpl::setSelector(QPtrList<CSSSelector> *selector)
  +void CSSStyleRuleImpl::setSelector(Q3PtrList<CSSSelector> *selector)
   {
       m_selector = selector;
   }
  
  
  
  1.6       +4 -4      SVGSupport/kdom/css/CSSStyleRuleImpl.h
  
  Index: CSSStyleRuleImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSStyleRuleImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSStyleRuleImpl.h	1 Sep 2005 09:39:05 -0000	1.5
  +++ CSSStyleRuleImpl.h	2 Sep 2005 10:03:03 -0000	1.6
  @@ -25,7 +25,7 @@
   
   #include <kdom/css/CSSRuleImpl.h>
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   namespace KDOM
   {
  @@ -47,17 +47,17 @@
           // 'CSSRule' functions
           virtual bool isStyleRule() const { return true; }
   
  -        void setSelector(QPtrList<CSSSelector> *selector);
  +        void setSelector(Q3PtrList<CSSSelector> *selector);
           void setDeclaration(CSSStyleDeclarationImpl *style);
   
  -        QPtrList<CSSSelector> *selector() { return m_selector; }
  +        Q3PtrList<CSSSelector> *selector() { return m_selector; }
           CSSStyleDeclarationImpl *declaration() { return m_style; }
   
           void setNonCSSHints();
   
       protected:
           CSSStyleDeclarationImpl *m_style;
  -        QPtrList<CSSSelector> *m_selector;
  +        Q3PtrList<CSSSelector> *m_selector;
       };
   };
   
  
  
  
  1.8       +20 -20    SVGSupport/kdom/css/CSSStyleSelector.cpp
  
  Index: CSSStyleSelector.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSStyleSelector.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CSSStyleSelector.cpp	1 Sep 2005 09:39:05 -0000	1.7
  +++ CSSStyleSelector.cpp	2 Sep 2005 10:03:04 -0000	1.8
  @@ -34,9 +34,9 @@
   #include <kglobal.h>
   
   #include <qtooltip.h>
  -#include <qvaluevector.h>
  +#include <q3valuevector.h>
   #include <qapplication.h>
  -#include <qpaintdevicemetrics.h>
  +#include <q3paintdevicemetrics.h>
   
   #include "Font.h"
   #include "KDOMPart.h"
  @@ -148,7 +148,7 @@
       // add stylesheets from document
       authorStyle = new CSSStyleSelectorList();
   
  -    QPtrListIterator<StyleSheetImpl> it(styleSheets->styleSheets);
  +    Q3PtrListIterator<StyleSheetImpl> it(styleSheets->styleSheets);
       for(; it.current(); ++it)
       {
              if(it.current()->isCSSStyleSheet())
  @@ -228,13 +228,13 @@
   
   #define MAXFONTSIZES 9
   
  -void CSSStyleSelector::computeFontSizes(QPaintDeviceMetrics *paintDeviceMetrics, int zoomFactor)
  +void CSSStyleSelector::computeFontSizes(Q3PaintDeviceMetrics *paintDeviceMetrics, int zoomFactor)
   {
       computeFontSizesFor(paintDeviceMetrics, zoomFactor, m_fontSizes, false);
       computeFontSizesFor(paintDeviceMetrics, zoomFactor, m_fixedFontSizes, true);
   }
   
  -void CSSStyleSelector::computeFontSizesFor(QPaintDeviceMetrics *paintDeviceMetrics, int zoomFactor, QValueVector<int> &fontSizes, bool isFixed)
  +void CSSStyleSelector::computeFontSizesFor(Q3PaintDeviceMetrics *paintDeviceMetrics, int zoomFactor, Q3ValueVector<int> &fontSizes, bool isFixed)
   {
       Q_UNUSED(isFixed);
           
  @@ -303,7 +303,7 @@
       }
   }
   
  -static inline int nextFontSize(const QValueVector<int> &a, int v, bool smaller)
  +static inline int nextFontSize(const Q3ValueVector<int> &a, int v, bool smaller)
   {
       // return the nearest bigger/smaller value in scale a, when v is in range.
       // otherwise increase/decrease value using a 1.2 fixed ratio
  @@ -547,8 +547,8 @@
       if(!decl && !addDecls)
           return numProps;
   
  -    QPtrList<CSSProperty> *values = decl ? decl->values() : 0;
  -    QPtrList<CSSProperty> *addValues = addDecls ? addDecls->values() : 0;
  +    Q3PtrList<CSSProperty> *values = decl ? decl->values() : 0;
  +    Q3PtrList<CSSProperty> *addValues = addDecls ? addDecls->values() : 0;
       if(!values && !addValues)
           return numProps;
   
  @@ -1495,7 +1495,7 @@
       clearLists();
       // collect all selectors and Properties in lists. Then transfer them to the array for faster lookup.
   
  -    QPtrList<CSSSelector> selectorList;
  +    Q3PtrList<CSSSelector> selectorList;
       CSSOrderedPropertyList propertyList;
   
       if(m_medium == "print" && defaultPrintStyle)
  @@ -1586,7 +1586,7 @@
   
   // -----------------------------------------------------------------
   
  -CSSStyleSelectorList::CSSStyleSelectorList() : QPtrList<CSSOrderedRule>()
  +CSSStyleSelectorList::CSSStyleSelectorList() : Q3PtrList<CSSOrderedRule>()
   {
       setAutoDelete(true);
   }
  @@ -1613,11 +1613,11 @@
           if(item->isStyleRule())
           {
               CSSStyleRuleImpl *r = static_cast<CSSStyleRuleImpl *>(item);
  -            QPtrList<CSSSelector> *s = r->selector();
  +            Q3PtrList<CSSSelector> *s = r->selector();
               for(int j = 0; j <(int)s->count(); j++)
               {
                   CSSOrderedRule *rule = new CSSOrderedRule(r, s->at(j), count());
  -                QPtrList<CSSOrderedRule>::append(rule);
  +                Q3PtrList<CSSOrderedRule>::append(rule);
                   //kdDebug() << "appending StyleRule!" << endl;
               }
           }
  @@ -1658,11 +1658,11 @@
                           // It is a StyleRule, so append it to our list
                           CSSStyleRuleImpl *styleRule = static_cast<CSSStyleRuleImpl *>(childItem);
   
  -                        QPtrList<CSSSelector> *s = styleRule->selector();
  +                        Q3PtrList<CSSSelector> *s = styleRule->selector();
                           for(int j = 0; j <(int) s->count(); j++)
                           {
                               CSSOrderedRule *orderedRule = new CSSOrderedRule(styleRule, s->at(j), count());
  -                            QPtrList<CSSOrderedRule>::append(orderedRule);
  +                            Q3PtrList<CSSOrderedRule>::append(orderedRule);
                           }
                       }
                       else
  @@ -1682,7 +1682,7 @@
       }
   }
   
  -void CSSStyleSelectorList::collect(QPtrList<CSSSelector> *selectorList, CSSOrderedPropertyList *propList, Source regular, Source important)
  +void CSSStyleSelectorList::collect(Q3PtrList<CSSSelector> *selectorList, CSSOrderedPropertyList *propList, Source regular, Source important)
   {
       CSSOrderedRule *r = first();
       while(r)
  @@ -1707,7 +1707,7 @@
   
   // -------------------------------------------------------------------------
   
  -int CSSOrderedPropertyList::compareItems(QPtrCollection::Item i1, QPtrCollection::Item i2)
  +int CSSOrderedPropertyList::compareItems(Q3PtrCollection::Item i1, Q3PtrCollection::Item i2)
   {
       int diff = static_cast<CSSOrderedProperty *>(i1)->priority -
                  static_cast<CSSOrderedProperty *>(i2)->priority;
  @@ -1720,7 +1720,7 @@
                                       unsigned int selector, unsigned int specificity,
                                       Source regular, Source important)
   {
  -    QPtrList<CSSProperty> *values = decl->values();
  +    Q3PtrList<CSSProperty> *values = decl->values();
       if(!values)
           return;
   
  @@ -1734,14 +1734,14 @@
           if(prop->m_nonCSSHint) source = NonCSSHint;
   
           bool first = ((decl && decl->interface()) ? decl->interface()->cssPropertyApplyFirst(prop->m_id) : false);
  -        QPtrList<CSSOrderedProperty>::append(new CSSOrderedProperty(prop, selector, first, source, specificity, count()));
  +        Q3PtrList<CSSOrderedProperty>::append(new CSSOrderedProperty(prop, selector, first, source, specificity, count()));
       }
   }
   
   // -------------------------------------------------------------------------------------
   // this is mostly boring stuff on how to apply a certain rule to the renderstyle...
   Length CSSStyleSelector::convertToLength(CSSPrimitiveValueImpl *primitiveValue, RenderStyle *style,
  -                                         QPaintDeviceMetrics *paintDeviceMetrics, bool *ok)
  +                                         Q3PaintDeviceMetrics *paintDeviceMetrics, bool *ok)
   {
       Length l;
       if(!primitiveValue)
  @@ -3382,7 +3382,7 @@
           {
               // keywords are being used.  Pick the correct default
               // based off the font family.
  -            const QValueVector<int> &fontSizes = m_fontSizes;
  +            const Q3ValueVector<int> &fontSizes = m_fontSizes;
               switch(primitiveValue->getIdent())
               {
                   case CSS_VAL_XX_SMALL:
  
  
  
  1.6       +16 -16    SVGSupport/kdom/css/CSSStyleSelector.h
  
  Index: CSSStyleSelector.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSStyleSelector.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSStyleSelector.h	1 Sep 2005 09:39:05 -0000	1.5
  +++ CSSStyleSelector.h	2 Sep 2005 10:03:04 -0000	1.6
  @@ -27,14 +27,14 @@
   #ifndef KDOM_CSSStyleSelector_H
   #define KDOM_CSSStyleSelector_H
   
  -#include <qptrlist.h>
  -#include <qvaluevector.h>
  +#include <q3ptrlist.h>
  +#include <q3valuevector.h>
   
   #include <kdom/DOMString.h>
   #include <kdom/css/RenderStyle.h>
   
   class KURL;
  -class QPaintDeviceMetrics;
  +class Q3PaintDeviceMetrics;
   
   namespace KDOM
   {
  @@ -126,8 +126,8 @@
   
           virtual RenderStyle *styleForElement(ElementImpl *e);
   
  -        QValueVector<int> fontSizes() const { return m_fontSizes; }
  -        QValueVector<int> fixedFontSizes() const { return m_fixedFontSizes; }
  +        Q3ValueVector<int> fontSizes() const { return m_fontSizes; }
  +        Q3ValueVector<int> fixedFontSizes() const { return m_fixedFontSizes; }
   
           bool strictParsing;
   
  @@ -138,8 +138,8 @@
               QString file;
           } encodedurl;
   
  -        void computeFontSizes(QPaintDeviceMetrics *paintDeviceMetrics, int zoomFactor);
  -        void computeFontSizesFor(QPaintDeviceMetrics *paintDeviceMetrics, int zoomFactor, QValueVector<int> &fontSizes, bool isFixed);
  +        void computeFontSizes(Q3PaintDeviceMetrics *paintDeviceMetrics, int zoomFactor);
  +        void computeFontSizesFor(Q3PaintDeviceMetrics *paintDeviceMetrics, int zoomFactor, Q3ValueVector<int> &fontSizes, bool isFixed);
   
       protected:
           /* checks if the complete selector (which can be build up from a few
  @@ -162,7 +162,7 @@
   
           // Helper function (used for instance by khtml's HTMLCSSStyleSelector)
           static Length convertToLength(CSSPrimitiveValueImpl *primitiveValue, RenderStyle *style,
  -                                      QPaintDeviceMetrics *paintDeviceMetrics, bool *ok = 0);
  +                                      Q3PaintDeviceMetrics *paintDeviceMetrics, bool *ok = 0);
   
           static RenderStyle *styleNotYetAvailable;
   
  @@ -215,7 +215,7 @@
           SelectorCache *selectorCache;
           unsigned int properties_size;
           CSSOrderedProperty **properties;
  -        QMemArray<CSSOrderedProperty> inlineProps;
  +        Q3MemArray<CSSOrderedProperty> inlineProps;
           QString m_medium;
           CSSOrderedProperty **propsToApply;
           CSSOrderedProperty **pseudoProps;
  @@ -232,10 +232,10 @@
           KDOMView *view;
           KDOMPart *part;
           const KDOMSettings *settings;
  -        QPaintDeviceMetrics *paintDeviceMetrics;
  +        Q3PaintDeviceMetrics *paintDeviceMetrics;
   
  -        QValueVector<int> m_fontSizes;
  -        QValueVector<int> m_fixedFontSizes;
  +        Q3ValueVector<int> m_fontSizes;
  +        Q3ValueVector<int> m_fixedFontSizes;
   
           bool fontDirty;
   
  @@ -281,10 +281,10 @@
        * This is the list we will collect all properties we need to apply in.
        * It will get sorted once before applying.
        */
  -    class CSSOrderedPropertyList : public QPtrList<CSSOrderedProperty>
  +    class CSSOrderedPropertyList : public Q3PtrList<CSSOrderedProperty>
       {
       public:
  -        virtual int compareItems(QPtrCollection::Item i1, QPtrCollection::Item i2);
  +        virtual int compareItems(Q3PtrCollection::Item i1, Q3PtrCollection::Item i2);
           void append(CSSStyleDeclarationImpl *decl, unsigned int selector,
                       unsigned int specificity, Source regular, Source important);
       };
  @@ -300,14 +300,14 @@
           int index;
       };
   
  -    class CSSStyleSelectorList : public QPtrList<CSSOrderedRule>
  +    class CSSStyleSelectorList : public Q3PtrList<CSSOrderedRule>
       {
       public:
           CSSStyleSelectorList();
           virtual ~CSSStyleSelectorList();
   
           void append(CSSStyleSheetImpl *sheet, DOMStringImpl *medium);
  -        void collect(QPtrList<CSSSelector> *selectorList, CSSOrderedPropertyList *propList,
  +        void collect(Q3PtrList<CSSSelector> *selectorList, CSSOrderedPropertyList *propList,
                        Source regular, Source important);
       };
   }
  
  
  
  1.5       +5 -5      SVGSupport/kdom/css/CSSStyleSheetImpl.cpp
  
  Index: CSSStyleSheetImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSStyleSheetImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CSSStyleSheetImpl.cpp	1 Sep 2005 07:33:08 -0000	1.4
  +++ CSSStyleSheetImpl.cpp	2 Sep 2005 10:03:04 -0000	1.5
  @@ -34,7 +34,7 @@
   CSSStyleSheetImpl::CSSStyleSheetImpl(CSSStyleSheetImpl *parentSheet, DOMStringImpl *href)
   : StyleSheetImpl(parentSheet, href)
   {
  -    m_lstChildren = new QPtrList<StyleBaseImpl>();
  +    m_lstChildren = new Q3PtrList<StyleBaseImpl>();
   
       m_doc = 0;
       m_implicit = false;
  @@ -44,7 +44,7 @@
   CSSStyleSheetImpl::CSSStyleSheetImpl(NodeImpl *parentNode, DOMStringImpl *href, bool _implicit)
   : StyleSheetImpl(parentNode, href)
   {
  -    m_lstChildren = new QPtrList<StyleBaseImpl>();
  +    m_lstChildren = new Q3PtrList<StyleBaseImpl>();
   
       m_doc = (!isDocumentNode(parentNode) ? parentNode->ownerDocument() : static_cast<DocumentImpl *>(parentNode));
       m_implicit = _implicit;
  @@ -54,7 +54,7 @@
   CSSStyleSheetImpl::CSSStyleSheetImpl(CSSRuleImpl *ownerRule, DOMStringImpl *href)
   : StyleSheetImpl(ownerRule, href)
   {
  -    m_lstChildren = new QPtrList<StyleBaseImpl>();
  +    m_lstChildren = new Q3PtrList<StyleBaseImpl>();
   
       m_doc = 0;
       m_implicit = false;
  @@ -64,7 +64,7 @@
   CSSStyleSheetImpl::CSSStyleSheetImpl(NodeImpl *parentNode, CSSStyleSheetImpl *orig)
   : StyleSheetImpl(parentNode, orig->m_strHref)
   {
  -    m_lstChildren = new QPtrList<StyleBaseImpl>();
  +    m_lstChildren = new Q3PtrList<StyleBaseImpl>();
   
       StyleBaseImpl *rule;
       for(rule = orig->m_lstChildren->first(); rule != 0; rule = orig->m_lstChildren->next())
  @@ -82,7 +82,7 @@
   : StyleSheetImpl(ownerRule, orig->m_strHref)
   {
       // m_lstChildren is deleted in StyleListImpl
  -    m_lstChildren = new QPtrList<StyleBaseImpl>();
  +    m_lstChildren = new Q3PtrList<StyleBaseImpl>();
   
       StyleBaseImpl *rule;
       for(rule = orig->m_lstChildren->first(); rule != 0; rule = orig->m_lstChildren->next())
  
  
  
  1.5       +1 -1      SVGSupport/kdom/css/CSSValueListImpl.cpp
  
  Index: CSSValueListImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSValueListImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CSSValueListImpl.cpp	1 Sep 2005 07:33:09 -0000	1.4
  +++ CSSValueListImpl.cpp	2 Sep 2005 10:03:04 -0000	1.5
  @@ -52,7 +52,7 @@
   {
       DOMStringImpl *result = new DOMStringImpl();
   
  -    for(QPtrListIterator<CSSValueImpl> iterator(m_values); iterator.current(); ++iterator)
  +    for(Q3PtrListIterator<CSSValueImpl> iterator(m_values); iterator.current(); ++iterator)
           result->append(iterator.current()->cssText());
   
       return result;
  
  
  
  1.6       +2 -2      SVGSupport/kdom/css/CSSValueListImpl.h
  
  Index: CSSValueListImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/CSSValueListImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSValueListImpl.h	1 Sep 2005 09:39:06 -0000	1.5
  +++ CSSValueListImpl.h	2 Sep 2005 10:03:04 -0000	1.6
  @@ -25,7 +25,7 @@
   
   #include <kdom/css/CSSValueImpl.h>
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   namespace KDOM
   {
  @@ -49,7 +49,7 @@
           void append(CSSValueImpl *val);
   
       protected:
  -        QPtrList<CSSValueImpl> m_values;
  +        Q3PtrList<CSSValueImpl> m_values;
       };
   };
   
  
  
  
  1.5       +5 -5      SVGSupport/kdom/css/Font.cpp
  
  Index: Font.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/Font.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Font.cpp	1 Sep 2005 07:33:09 -0000	1.4
  +++ Font.cpp	2 Sep 2005 10:03:04 -0000	1.5
  @@ -29,7 +29,7 @@
   #include <kglobal.h>
   
   #include <qfontdatabase.h>
  -#include <qpaintdevicemetrics.h>
  +#include <q3paintdevicemetrics.h>
   
   #include "Font.h"
   #include "KDOMSettings.h"
  @@ -65,7 +65,7 @@
               m_letterSpacing == other.m_letterSpacing);
   }
   
  -void Font::update(QPaintDeviceMetrics *devMetrics, const KDOMSettings *settings) const
  +void Font::update(Q3PaintDeviceMetrics *devMetrics, const KDOMSettings *settings) const
   {
   #ifndef APPLE_COMPILE_HACK
       m_font.setFamily(m_fontDef.family.isEmpty() ? settings->stdFontName() : m_fontDef.family);
  @@ -83,7 +83,7 @@
       // all other font properties should be set before this one!!!!
       if(!db.isSmoothlyScalable(m_font.family(), db.styleString(m_font)))
       {
  -        const QValueList<int> pointSizes = db.smoothSizes(m_font.family(), db.styleString(m_font));
  +        const Q3ValueList<int> pointSizes = db.smoothSizes(m_font.family(), db.styleString(m_font));
           
           // lets see if we find a nice looking font, which is not too far away from the requested one.
           // kdDebug(6080) << "khtml::setFontSize family = " << m_font.family() << " size requested=" << size << endl;
  @@ -91,8 +91,8 @@
           float diff = 1; // ### 100% deviation
           float bestSize = 0;
   
  -        QValueList<int>::ConstIterator it = pointSizes.begin();
  -        const QValueList<int>::ConstIterator itEnd = pointSizes.end();
  +        Q3ValueList<int>::ConstIterator it = pointSizes.begin();
  +        const Q3ValueList<int>::ConstIterator itEnd = pointSizes.end();
   
           for(; it != itEnd; ++it)
           {
  
  
  
  1.6       +2 -2      SVGSupport/kdom/css/Font.h
  
  Index: Font.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/Font.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Font.h	1 Sep 2005 07:33:10 -0000	1.5
  +++ Font.h	2 Sep 2005 10:03:04 -0000	1.6
  @@ -28,7 +28,7 @@
   #include <qpainter.h>
   #include <qfontmetrics.h>
   
  -class QPaintDeviceMetrics;
  +class Q3PaintDeviceMetrics;
   
   namespace KDOM
   {
  @@ -66,7 +66,7 @@
   
       bool operator==(const Font &other) const;
       
  -    void update(QPaintDeviceMetrics *devMetrics, const KDOMSettings *settings) const;
  +    void update(Q3PaintDeviceMetrics *devMetrics, const KDOMSettings *settings) const;
   
       /**
        * Draws a piece from the given piece of text.
  
  
  
  1.6       +2 -2      SVGSupport/kdom/css/KDOMCSSParser.cpp
  
  Index: KDOMCSSParser.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/KDOMCSSParser.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- KDOMCSSParser.cpp	1 Sep 2005 09:39:06 -0000	1.5
  +++ KDOMCSSParser.cpp	2 Sep 2005 10:03:05 -0000	1.6
  @@ -354,7 +354,7 @@
   
   CSSStyleDeclarationImpl *CSSParser::createStyleDeclaration(CSSStyleRuleImpl *rule)
   {
  -    QPtrList<CSSProperty> *propList = new QPtrList<CSSProperty>();
  +    Q3PtrList<CSSProperty> *propList = new Q3PtrList<CSSProperty>();
       propList->setAutoDelete(true);
       for(int i = 0; i < numParsedProperties; i++)
           propList->append(parsedProperties[i]);
  @@ -363,7 +363,7 @@
       return createCSSStyleDeclaration(rule, propList);
   }
   
  -CSSStyleDeclarationImpl *CSSParser::createCSSStyleDeclaration(CSSStyleRuleImpl *rule, QPtrList<CSSProperty> *propList)
  +CSSStyleDeclarationImpl *CSSParser::createCSSStyleDeclaration(CSSStyleRuleImpl *rule, Q3PtrList<CSSProperty> *propList)
   {
       return new CSSStyleDeclarationImpl(document()->implementation()->cdfInterface(), rule, propList);
   }
  
  
  
  1.6       +2 -2      SVGSupport/kdom/css/KDOMCSSParser.h
  
  Index: KDOMCSSParser.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/KDOMCSSParser.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- KDOMCSSParser.h	1 Sep 2005 09:39:06 -0000	1.5
  +++ KDOMCSSParser.h	2 Sep 2005 10:03:05 -0000	1.6
  @@ -27,7 +27,7 @@
   #define KDOM_CSSPARSER_H
   
   #include <qstring.h>
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kdom/core/DOMStringImpl.h>
   
  @@ -153,7 +153,7 @@
           static bool validUnit(KDOMCSSValue *value, int unitflags, bool strict);
   
           virtual CSSStyleDeclarationImpl *createCSSStyleDeclaration(CSSStyleRuleImpl *rule,
  -                                                                   QPtrList<CSSProperty> *propList);
  +                                                                   Q3PtrList<CSSProperty> *propList);
   
       public:
           bool strict;
  
  
  
  1.5       +4 -4      SVGSupport/kdom/css/MediaListImpl.cpp
  
  Index: MediaListImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/MediaListImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MediaListImpl.cpp	1 Sep 2005 07:33:10 -0000	1.4
  +++ MediaListImpl.cpp	2 Sep 2005 10:03:05 -0000	1.5
  @@ -67,8 +67,8 @@
   {
       DOMStringImpl *text = new DOMStringImpl();
       
  -    QValueList<DOMString>::ConstIterator it = m_lstMedia.begin();
  -    const QValueList<DOMString>::ConstIterator end = m_lstMedia.end();
  +    Q3ValueList<DOMString>::ConstIterator it = m_lstMedia.begin();
  +    const Q3ValueList<DOMString>::ConstIterator end = m_lstMedia.end();
       
       for(; it != end; ++it)
           text->append((*it).string() + QString::fromLatin1(", "));
  @@ -106,8 +106,8 @@
   
   void MediaListImpl::deleteMedium(DOMStringImpl *oldMedium)
   {
  -    QValueList<DOMString>::Iterator it = m_lstMedia.begin();
  -    const QValueList<DOMString>::Iterator end = m_lstMedia.end();
  +    Q3ValueList<DOMString>::Iterator it = m_lstMedia.begin();
  +    const Q3ValueList<DOMString>::Iterator end = m_lstMedia.end();
   
       for(; it != end; ++it)
       {
  
  
  
  1.6       +2 -2      SVGSupport/kdom/css/MediaListImpl.h
  
  Index: MediaListImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/MediaListImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MediaListImpl.h	1 Sep 2005 09:39:06 -0000	1.5
  +++ MediaListImpl.h	2 Sep 2005 10:03:05 -0000	1.6
  @@ -26,7 +26,7 @@
   #include <kdom/css/StyleBaseImpl.h>
   #include <kdom/DOMString.h>
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   namespace KDOM
   {
  @@ -69,7 +69,7 @@
           bool contains(DOMStringImpl *medium) const;
   
       protected:
  -        QValueList<DOMString> m_lstMedia;
  +        Q3ValueList<DOMString> m_lstMedia;
       };
   };
   
  
  
  
  1.6       +2 -2      SVGSupport/kdom/css/StyleBaseImpl.cpp
  
  Index: StyleBaseImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/StyleBaseImpl.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StyleBaseImpl.cpp	1 Sep 2005 09:39:06 -0000	1.5
  +++ StyleBaseImpl.cpp	2 Sep 2005 10:03:05 -0000	1.6
  @@ -124,9 +124,9 @@
       return sheet->ownerNode()->ownerDocument()->documentKURI();
   }
   
  -void StyleBaseImpl::setParsedValue(int propId, const CSSValueImpl *parsedValue, bool important, bool nonCSSHint, QPtrList<CSSProperty> *propList)
  +void StyleBaseImpl::setParsedValue(int propId, const CSSValueImpl *parsedValue, bool important, bool nonCSSHint, Q3PtrList<CSSProperty> *propList)
   {
  -    QPtrListIterator<CSSProperty> propIt(*propList);
  +    Q3PtrListIterator<CSSProperty> propIt(*propList);
       propIt.toLast(); // just remove the top one - not sure what should happen if we have multiple instances of the property
   
       while(propIt.current() &&
  
  
  
  1.6       +3 -3      SVGSupport/kdom/css/StyleBaseImpl.h
  
  Index: StyleBaseImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/StyleBaseImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StyleBaseImpl.h	1 Sep 2005 09:39:06 -0000	1.5
  +++ StyleBaseImpl.h	2 Sep 2005 10:03:05 -0000	1.6
  @@ -29,7 +29,7 @@
   #ifndef KDOM_StyleBaseImpl_H
   #define KDOM_StyleBaseImpl_H
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kdom/TreeShared.h>
   #include <kdom/core/NodeImpl.h>
  @@ -122,7 +122,7 @@
           void setParent(StyleBaseImpl *parent);
   
           static void setParsedValue(int propId, const CSSValueImpl *parsedValue,
  -                                   bool important, bool nonCSSHint, QPtrList<CSSProperty> *propList);
  +                                   bool important, bool nonCSSHint, Q3PtrList<CSSProperty> *propList);
   
           virtual bool parseString(DOMStringImpl *cssString, bool = false);
   
  @@ -157,7 +157,7 @@
           void append(StyleBaseImpl *item);
   
       protected:
  -        QPtrList<StyleBaseImpl> *m_lstChildren;
  +        Q3PtrList<StyleBaseImpl> *m_lstChildren;
       };
   
       // this class represents a selector for a StyleRule
  
  
  
  1.5       +3 -3      SVGSupport/kdom/css/StyleSheetListImpl.cpp
  
  Index: StyleSheetListImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/StyleSheetListImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StyleSheetListImpl.cpp	1 Sep 2005 07:33:12 -0000	1.4
  +++ StyleSheetListImpl.cpp	2 Sep 2005 10:03:05 -0000	1.5
  @@ -32,7 +32,7 @@
   
   StyleSheetListImpl::~StyleSheetListImpl()
   {
  -    QPtrListIterator<StyleSheetImpl> it(styleSheets);
  +    Q3PtrListIterator<StyleSheetImpl> it(styleSheets);
       for(; it.current(); ++it)
           it.current()->deref();
   }
  @@ -41,7 +41,7 @@
   {
       // hack so implicit BODY stylesheets don't get counted here
       unsigned long l = 0;
  -    QPtrListIterator<StyleSheetImpl> it(styleSheets);
  +    Q3PtrListIterator<StyleSheetImpl> it(styleSheets);
       for(; it.current(); ++it)
       {
           if(!it.current()->isCSSStyleSheet() || !static_cast<CSSStyleSheetImpl*>(it.current())->implicit())
  @@ -54,7 +54,7 @@
   StyleSheetImpl *StyleSheetListImpl::item(unsigned long index) const
   {
       unsigned long l = 0;
  -    QPtrListIterator<StyleSheetImpl> it(styleSheets);
  +    Q3PtrListIterator<StyleSheetImpl> it(styleSheets);
       for(; it.current(); ++it)
       {
           if(!it.current()->isCSSStyleSheet() || !static_cast<CSSStyleSheetImpl *>(it.current())->implicit())
  
  
  
  1.4       +2 -2      SVGSupport/kdom/css/StyleSheetListImpl.h
  
  Index: StyleSheetListImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/css/StyleSheetListImpl.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StyleSheetListImpl.h	1 Sep 2005 07:33:12 -0000	1.3
  +++ StyleSheetListImpl.h	2 Sep 2005 10:03:06 -0000	1.4
  @@ -25,7 +25,7 @@
   
   #include <kdom/Shared.h>
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   namespace KDOM
   {
  @@ -43,7 +43,7 @@
           void add(StyleSheetImpl *s);
           void remove(StyleSheetImpl *s);
   
  -        QPtrList<StyleSheetImpl> styleSheets;
  +        Q3PtrList<StyleSheetImpl> styleSheets;
       };
   };
   
  
  
  
  1.6       +3 -3      SVGSupport/kdom/ecma/ScriptInterpreter.cpp
  
  Index: ScriptInterpreter.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/ecma/ScriptInterpreter.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ScriptInterpreter.cpp	1 Sep 2005 07:33:24 -0000	1.5
  +++ ScriptInterpreter.cpp	2 Sep 2005 10:03:09 -0000	1.6
  @@ -26,7 +26,7 @@
   #include <kjs/object.h>
   
   #include <qptrdict.h>
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include "EventImpl.h"
   #include "DocumentImpl.h"
  @@ -34,7 +34,7 @@
   
   using namespace KDOM;
   
  -typedef QPtrList<ScriptInterpreter> InterpreterList;
  +typedef Q3PtrList<ScriptInterpreter> InterpreterList;
   static InterpreterList *s_interpreterList;
   
   class ScriptInterpreter::Private
  @@ -127,7 +127,7 @@
       if(!s_interpreterList)
           return;
   
  -    QPtrListIterator<ScriptInterpreter> it(*s_interpreterList);
  +    Q3PtrListIterator<ScriptInterpreter> it(*s_interpreterList);
       while(it.current())
       {
           (*it)->removeDOMObject(handle);
  
  
  
  1.5       +6 -6      SVGSupport/kdom/events/EventTargetImpl.cpp
  
  Index: EventTargetImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/events/EventTargetImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EventTargetImpl.cpp	1 Sep 2005 07:33:27 -0000	1.4
  +++ EventTargetImpl.cpp	2 Sep 2005 10:03:10 -0000	1.5
  @@ -68,7 +68,7 @@
   
       if(!m_eventListeners)
       {
  -        m_eventListeners = new QPtrList<RegisteredEventListener>();
  +        m_eventListeners = new Q3PtrList<RegisteredEventListener>();
           m_eventListeners->setAutoDelete(true);
       }
       else
  @@ -76,7 +76,7 @@
           // If there is an existing listener forget this call...
           RegisteredEventListener compare(type, listener, useCapture); 
   
  -        QPtrListIterator<RegisteredEventListener> it(*m_eventListeners);
  +        Q3PtrListIterator<RegisteredEventListener> it(*m_eventListeners);
           for(; it.current(); ++it)
           {
               if(*(it.current()) == compare)
  @@ -109,7 +109,7 @@
   
       RegisteredEventListener compare(type, listener, useCapture);
   
  -    QPtrListIterator<RegisteredEventListener> it(*m_eventListeners);
  +    Q3PtrListIterator<RegisteredEventListener> it(*m_eventListeners);
       for(; it.current(); ++it)
       {
           if((*it.current()) == compare)
  @@ -130,7 +130,7 @@
   
       // Find out, where to send to -> collect parent nodes,
       // cast them to EventTargets and add them to list
  -    QPtrList<EventTargetImpl> targetChain;
  +    Q3PtrList<EventTargetImpl> targetChain;
   
       NodeImpl *i = dynamic_cast<NodeImpl *>(this);
       if(!i)
  @@ -145,7 +145,7 @@
       // Trigger any capturing event handlers on our way down
       evt->setEventPhase(CAPTURING_PHASE);
   
  -    QPtrListIterator<EventTargetImpl> it(targetChain);
  +    Q3PtrListIterator<EventTargetImpl> it(targetChain);
       for(; it.current() && it.current() != this && !evt->propagationStopped(); ++it)
       {
           EventTargetImpl *i = it.current();
  @@ -214,7 +214,7 @@
   
       KJS::Interpreter::lock();
   
  -    QPtrListIterator<RegisteredEventListener> it(*m_eventListeners);
  +    Q3PtrListIterator<RegisteredEventListener> it(*m_eventListeners);
       for(; it.current(); ++it)
       {
           RegisteredEventListener *current = it.current();
  
  
  
  1.5       +2 -2      SVGSupport/kdom/events/EventTargetImpl.h
  
  Index: EventTargetImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/events/EventTargetImpl.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EventTargetImpl.h	1 Sep 2005 07:33:27 -0000	1.4
  +++ EventTargetImpl.h	2 Sep 2005 10:03:10 -0000	1.5
  @@ -23,7 +23,7 @@
   #ifndef KDOM_EventTargetImpl_H
   #define KDOM_EventTargetImpl_H
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kdom/DOMString.h>
   #include <kdom/TreeShared.h>
  @@ -58,7 +58,7 @@
       private:
           int m_listenerTypes;
   
  -        QPtrList<RegisteredEventListener> *m_eventListeners;
  +        Q3PtrList<RegisteredEventListener> *m_eventListeners;
       };
   };
   
  
  
  
  1.5       +2 -2      SVGSupport/kdom/ls/LSParserImpl.cpp
  
  Index: LSParserImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/ls/LSParserImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LSParserImpl.cpp	1 Sep 2005 07:33:51 -0000	1.4
  +++ LSParserImpl.cpp	2 Sep 2005 10:03:10 -0000	1.5
  @@ -22,7 +22,7 @@
   
   #include <qdir.h>
   #include <qbuffer.h>
  -#include <qcstring.h>
  +#include <q3cstring.h>
   
   #include <kmimetype.h>
   
  @@ -132,7 +132,7 @@
       else if(input->byteStream() && !input->byteStream()->isEmpty())
       {
           QString str(input->byteStream()->string());
  -        QCString in(str.ascii(), str.length() + 1);
  +        Q3CString in(str.ascii(), str.length() + 1);
   
           int a, b;
           unsigned int i = 0;
  
  
  
  1.5       +2 -2      SVGSupport/kdom/parser/KDOMDocumentBuilder.cpp
  
  Index: KDOMDocumentBuilder.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/parser/KDOMDocumentBuilder.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KDOMDocumentBuilder.cpp	1 Sep 2005 07:33:53 -0000	1.4
  +++ KDOMDocumentBuilder.cpp	2 Sep 2005 10:03:11 -0000	1.5
  @@ -23,7 +23,7 @@
   #include <kurl.h>
   #include <kdebug.h>
   
  -#include <qptrstack.h>
  +#include <q3ptrstack.h>
   
   #include "kdom.h"
   #include <kdom/Helper.h>
  @@ -54,7 +54,7 @@
   
       bool cdata;
       DocumentImpl *doc;
  -    QPtrStack<NodeImpl> nodes;
  +    Q3PtrStack<NodeImpl> nodes;
   };
   
   DocumentBuilder::DocumentBuilder() : d(new Private())
  
  
  
  1.3       +4 -4      SVGSupport/kdom/xpath/impl/expression.cpp
  
  Index: expression.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/expression.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- expression.cpp	1 Sep 2005 07:34:03 -0000	1.2
  +++ expression.cpp	2 Sep 2005 10:03:11 -0000	1.3
  @@ -213,7 +213,7 @@
   
   Expression::~Expression()
   {
  -    QValueList<Expression *>::Iterator it, end = m_subExpressions.end();
  +    Q3ValueList<Expression *>::Iterator it, end = m_subExpressions.end();
       for ( it = m_subExpressions.begin(); it != end; ++it ) {
           delete *it;
       }
  @@ -236,7 +236,7 @@
   void Expression::optimize()
   {
       bool allSubExpressionsConstant = true;
  -    QValueList<Expression *>::Iterator it, end = m_subExpressions.end();
  +    Q3ValueList<Expression *>::Iterator it, end = m_subExpressions.end();
       for ( it = m_subExpressions.begin(); it != end; ++it ) {
           Expression *expr = *it;
           if ( expr->isConstant() ) {
  @@ -249,7 +249,7 @@
       if ( allSubExpressionsConstant ) {
           m_constantValue = new Value( doEvaluate() );
   
  -        QValueList<Expression *>::Iterator it, end = m_subExpressions.end();
  +        Q3ValueList<Expression *>::Iterator it, end = m_subExpressions.end();
           for ( it = m_subExpressions.begin(); it != end; ++it ) {
               delete *it;
           }
  @@ -276,7 +276,7 @@
   
   bool Expression::isConstant() const
   {
  -    QValueList<Expression *>::ConstIterator it, end = m_subExpressions.end();
  +    Q3ValueList<Expression *>::ConstIterator it, end = m_subExpressions.end();
       for ( it = m_subExpressions.begin(); it != end; ++it ) {
           if ( !( *it )->isConstant() ) {
               return false;
  
  
  
  1.3       +3 -3      SVGSupport/kdom/xpath/impl/expression.h
  
  Index: expression.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/expression.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- expression.h	1 Sep 2005 07:34:03 -0000	1.2
  +++ expression.h	2 Sep 2005 10:03:11 -0000	1.3
  @@ -29,7 +29,7 @@
   
   #include "DOMStringImpl.h"
   
  -#include <qdict.h>
  +#include <q3dict.h>
   
   namespace KDOM {
       class NodeImpl;
  @@ -40,7 +40,7 @@
       KDOM::NodeImpl *node;
       unsigned long size;
       unsigned long position;
  -    QDict<KDOM::DOMStringImpl> variableBindings;
  +    Q3Dict<KDOM::DOMStringImpl> variableBindings;
       /* The function library is globally accessible through
        * FunctionLibrary::self()
        */
  @@ -107,7 +107,7 @@
   
           static EvaluationContext s_evaluationContext;
   
  -        QValueList<Expression *> m_subExpressions;
  +        Q3ValueList<Expression *> m_subExpressions;
           Value *m_constantValue;
   };
   
  
  
  
  1.3       +3 -3      SVGSupport/kdom/xpath/impl/functions.cpp
  
  Index: functions.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/functions.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- functions.cpp	1 Sep 2005 07:34:03 -0000	1.2
  +++ functions.cpp	2 Sep 2005 10:03:11 -0000	1.3
  @@ -328,9 +328,9 @@
       return s;
   }
   
  -void Function::setArguments( const QValueList<Expression *> &args )
  +void Function::setArguments( const Q3ValueList<Expression *> &args )
   {
  -    QValueList<Expression *>::ConstIterator it, end = args.end();
  +    Q3ValueList<Expression *>::ConstIterator it, end = args.end();
       for ( it = args.begin(); it != end; ++it ) {
           addSubExpression( *it );
       }
  @@ -906,7 +906,7 @@
   }
   
   Function *FunctionLibrary::getFunction( const char *name,
  -                                        const QValueList<Expression *> &args ) const
  +                                        const Q3ValueList<Expression *> &args ) const
   {
       if ( !m_functionDict.find( name ) ) {
           qWarning( "Function '%s' not supported by this implementation.", name );
  
  
  
  1.3       +5 -5      SVGSupport/kdom/xpath/impl/functions.h
  
  Index: functions.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/functions.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- functions.h	1 Sep 2005 07:34:03 -0000	1.2
  +++ functions.h	2 Sep 2005 10:03:11 -0000	1.3
  @@ -27,13 +27,13 @@
   
   #include "expression.h"
   
  -#include <qdict.h>
  -#include <qvaluelist.h>
  +#include <q3dict.h>
  +#include <q3valuelist.h>
   
   class Function : public Expression
   {
       public:
  -        void setArguments( const QValueList<Expression *> &args );
  +        void setArguments( const Q3ValueList<Expression *> &args );
           void setName( const QString &name );
   
           virtual QString dump() const;
  @@ -55,7 +55,7 @@
           static FunctionLibrary &self();
   
           Function *getFunction( const char *name,
  -                               const QValueList<Expression *> &args = QValueList<Expression *>() ) const;
  +                               const Q3ValueList<Expression *> &args = Q3ValueList<Expression *>() ) const;
   
       private:
           struct FunctionRec;
  @@ -65,7 +65,7 @@
           FunctionLibrary &operator=( const FunctionLibrary &rhs );
   
           static FunctionLibrary *s_instance;
  -        QDict<FunctionRec> m_functionDict;
  +        Q3Dict<FunctionRec> m_functionDict;
   };
   
   #endif // FUNCTIONS_H
  
  
  
  1.3       +6 -6      SVGSupport/kdom/xpath/impl/path.cpp
  
  Index: path.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/path.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- path.cpp	1 Sep 2005 07:34:03 -0000	1.2
  +++ path.cpp	2 Sep 2005 10:03:11 -0000	1.3
  @@ -26,7 +26,7 @@
   
   #include "NodeImpl.h"
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   using namespace KDOM;
   
  @@ -37,7 +37,7 @@
   
   Path::~Path()
   {
  -    QValueList<Step *>::Iterator it, end = m_steps.end();
  +    Q3ValueList<Step *>::Iterator it, end = m_steps.end();
       for ( it = m_steps.begin(); it != end; ++it ) {
           delete *it;
       }
  @@ -50,7 +50,7 @@
   
   void Path::optimize()
   {
  -    QValueList<Step *>::Iterator it, end = m_steps.end();
  +    Q3ValueList<Step *>::Iterator it, end = m_steps.end();
       for ( it = m_steps.begin(); it != end; ++it ) {
           ( *it )->optimize();
       }
  @@ -78,8 +78,8 @@
   
       inDomNodes.append( context );
   
  -    QValueList<Step *>::ConstIterator it = m_steps.begin();
  -    QValueList<Step *>::ConstIterator end = m_steps.end();
  +    Q3ValueList<Step *>::ConstIterator it = m_steps.begin();
  +    Q3ValueList<Step *>::ConstIterator end = m_steps.end();
       for ( ; it != end; ++it ) {
           Step *step = *it;
           for ( unsigned int i = 0; i < inDomNodes.count(); ++i ) {
  @@ -101,7 +101,7 @@
       QString s = "<path absolute=\"";
       s += m_absolute ? "true" : "false";
       s += "\">";
  -    QValueList<Step *>::ConstIterator it, end = m_steps.end();
  +    Q3ValueList<Step *>::ConstIterator it, end = m_steps.end();
       for ( it = m_steps.begin(); it != end; ++it ) {
           s += ( *it )->dump();
       }
  
  
  
  1.3       +2 -2      SVGSupport/kdom/xpath/impl/path.h
  
  Index: path.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/path.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- path.h	1 Sep 2005 07:34:03 -0000	1.2
  +++ path.h	2 Sep 2005 10:03:11 -0000	1.3
  @@ -28,7 +28,7 @@
   #include "expression.h"
   #include "step.h"
   
  -template <typename T> class QValueList;
  +template <typename T> class Q3ValueList;
   
   class Path : public Expression
   {
  @@ -45,7 +45,7 @@
       private:
           virtual Value doEvaluate() const;
   
  -        QValueList<Step *> m_steps;
  +        Q3ValueList<Step *> m_steps;
           bool m_absolute;
   };
   
  
  
  
  1.3       +6 -6      SVGSupport/kdom/xpath/impl/step.cpp
  
  Index: step.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/step.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- step.cpp	1 Sep 2005 07:34:04 -0000	1.2
  +++ step.cpp	2 Sep 2005 10:03:11 -0000	1.3
  @@ -57,7 +57,7 @@
   }
   
   Step::Step( AxisType axis, const DomString &nodeTest,
  -            const QValueList<Predicate *> &predicates )
  +            const Q3ValueList<Predicate *> &predicates )
       : m_axis( axis ),
       m_nodeTest( nodeTest ),
       m_predicates( predicates )
  @@ -66,8 +66,8 @@
   
   Step::~Step()
   {
  -    QValueList<Predicate *>::Iterator it = m_predicates.begin();
  -    QValueList<Predicate *>::Iterator end = m_predicates.end();
  +    Q3ValueList<Predicate *>::Iterator it = m_predicates.begin();
  +    Q3ValueList<Predicate *>::Iterator end = m_predicates.end();
       for ( ; it != end; ++it ) {
           delete *it;
       }
  @@ -92,7 +92,7 @@
       nodes = nodeTestMatches( nodes );
       qDebug( "\tNodetest '%s' trims this number to %i.", m_nodeTest.latin1(), nodes.count() );
   
  -    QValueList<Predicate *>::ConstIterator it, end = m_predicates.end();
  +    Q3ValueList<Predicate *>::ConstIterator it, end = m_predicates.end();
       for ( it = m_predicates.begin(); it != end; ++it ) {
           Expression::evaluationContext().size = nodes.count();
           Expression::evaluationContext().position = 1;
  @@ -377,7 +377,7 @@
   
   void Step::optimize()
   {
  -    QValueList<Predicate *>::ConstIterator it, end = m_predicates.end();
  +    Q3ValueList<Predicate *>::ConstIterator it, end = m_predicates.end();
       for ( it = m_predicates.begin(); it != end; ++it ) {
           ( *it )->optimize();
       }
  @@ -386,7 +386,7 @@
   QString Step::dump() const
   {
       QString s = QString( "<step axis=\"%1\" nodetest=\"%2\">" ).arg( axisAsString( m_axis ) ).arg( m_nodeTest ).local8Bit().data();
  -    QValueList<Predicate *>::ConstIterator it, end = m_predicates.end();
  +    Q3ValueList<Predicate *>::ConstIterator it, end = m_predicates.end();
       for ( it = m_predicates.begin(); it != end; ++it ) {
           s += ( *it )->dump();
       }
  
  
  
  1.3       +2 -2      SVGSupport/kdom/xpath/impl/step.h
  
  Index: step.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/step.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- step.h	1 Sep 2005 07:34:04 -0000	1.2
  +++ step.h	2 Sep 2005 10:03:12 -0000	1.3
  @@ -48,7 +48,7 @@
           Step();
           Step( AxisType axis,
                 const DomString &nodeTest,
  -              const QValueList<Predicate *> &predicates = QValueList<Predicate *>() );
  +              const Q3ValueList<Predicate *> &predicates = Q3ValueList<Predicate *>() );
           ~Step();
   
           DomNodeList evaluate( KDOM::NodeImpl *context ) const;
  @@ -62,7 +62,7 @@
   
           AxisType m_axis;
           DomString m_nodeTest;
  -        QValueList<Predicate *> m_predicates;
  +        Q3ValueList<Predicate *> m_predicates;
   };
   
   #endif // STEP_H
  
  
  
  1.3       +4 -4      SVGSupport/kdom/xpath/impl/tokenizer.cpp
  
  Index: tokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/tokenizer.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tokenizer.cpp	1 Sep 2005 07:34:04 -0000	1.2
  +++ tokenizer.cpp	2 Sep 2005 10:03:12 -0000	1.3
  @@ -64,8 +64,8 @@
   
   Tokenizer* Tokenizer::s_instance = 0;
   
  -QDict<Step::AxisType>* Tokenizer::s_axisNamesDict     = 0;
  -QDict<char>* Tokenizer::s_nodeTypeNamesDict = 0;
  +Q3Dict<Step::AxisType>* Tokenizer::s_axisNamesDict     = 0;
  +Q3Dict<char>* Tokenizer::s_nodeTypeNamesDict = 0;
   
   Tokenizer &Tokenizer::self()
   {
  @@ -111,7 +111,7 @@
   bool Tokenizer::isAxisName(QString name, Step::AxisType *type)
   {
       if (!s_axisNamesDict) {
  -        s_axisNamesDict = new QDict<Step::AxisType>;
  +        s_axisNamesDict = new Q3Dict<Step::AxisType>;
           s_axisNamesDict->setAutoDelete( true );
           for (unsigned int p = 0; p < axisNamesCount; ++p)
               s_axisNamesDict->insert(QString::fromLatin1(axisNames[p].name),
  @@ -129,7 +129,7 @@
   {
   #ifndef APPLE_COMPILE_HACK
       if (!s_nodeTypeNamesDict) {
  -        s_nodeTypeNamesDict = new QDict<char>;
  +        s_nodeTypeNamesDict = new Q3Dict<char>;
           for (int p = 0; nodeTypeNames[p]; ++p)
               s_nodeTypeNamesDict->insert(QString::fromLatin1(nodeTypeNames[p]),
                                           nodeTypeNames /*dummy*/);
  
  
  
  1.3       +3 -3      SVGSupport/kdom/xpath/impl/tokenizer.h
  
  Index: tokenizer.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/tokenizer.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tokenizer.h	1 Sep 2005 07:34:04 -0000	1.2
  +++ tokenizer.h	2 Sep 2005 10:03:12 -0000	1.3
  @@ -25,7 +25,7 @@
   #ifndef TOKENIZER_H
   #define TOKENIZER_H
   
  -#include <qdict.h>
  +#include <q3dict.h>
   #include <qstring.h>
   
   #include "step.h"
  @@ -56,8 +56,8 @@
       QString m_data;
       int m_lastTokenType;
   
  -    static QDict<Step::AxisType>* s_axisNamesDict;
  -    static QDict<char>* s_nodeTypeNamesDict;
  +    static Q3Dict<Step::AxisType>* s_axisNamesDict;
  +    static Q3Dict<char>* s_nodeTypeNamesDict;
       static Tokenizer* s_instance;
   
       enum XMLCat {
  
  
  
  1.3       +2 -2      SVGSupport/kdom/xpath/impl/util.h
  
  Index: util.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/util.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util.h	1 Sep 2005 07:34:04 -0000	1.2
  +++ util.h	2 Sep 2005 10:03:12 -0000	1.3
  @@ -26,13 +26,13 @@
   #define UTIL_H
   
   #include <qstring.h>
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   namespace KDOM {
       class NodeImpl;
   }
   
  -typedef QValueList<KDOM::NodeImpl *> DomNodeList;
  +typedef Q3ValueList<KDOM::NodeImpl *> DomNodeList;
   typedef QString DomString;
   
   /* @return whether the given node is the root node.
  
  
  
  1.3       +1 -1      SVGSupport/kdom/xpath/impl/variablereference.cpp
  
  Index: variablereference.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpath/impl/variablereference.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- variablereference.cpp	1 Sep 2005 07:34:04 -0000	1.2
  +++ variablereference.cpp	2 Sep 2005 10:03:12 -0000	1.3
  @@ -41,7 +41,7 @@
   
   Value VariableReference::doEvaluate() const
   {
  -    QDict<KDOM::DOMStringImpl> bindings = evaluationContext().variableBindings;
  +    Q3Dict<KDOM::DOMStringImpl> bindings = evaluationContext().variableBindings;
       if ( !bindings.find( m_name ) ) {
           // XXX What to do if an unknown variable is referenced?
           return Value( "" );
  
  
  
  1.4       +2 -2      SVGSupport/kdom/xpointer/impl/ElementSchemeImpl.cpp
  
  Index: ElementSchemeImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpointer/impl/ElementSchemeImpl.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ElementSchemeImpl.cpp	1 Sep 2005 07:34:07 -0000	1.3
  +++ ElementSchemeImpl.cpp	2 Sep 2005 10:03:14 -0000	1.4
  @@ -142,8 +142,8 @@
           resultNode = context; /* Guranteed to be document node. */
   
       Q_ASSERT(resultNode);
  -    QValueList<unsigned int>::const_iterator it;
  -    QValueList<unsigned int>::const_iterator end(m_childSequence.constEnd());
  +    Q3ValueList<unsigned int>::const_iterator it;
  +    Q3ValueList<unsigned int>::const_iterator end(m_childSequence.constEnd());
   
       for(it = m_childSequence.constBegin(); it != end; ++it)
       {
  
  
  
  1.4       +2 -2      SVGSupport/kdom/xpointer/impl/ElementSchemeImpl.h
  
  Index: ElementSchemeImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpointer/impl/ElementSchemeImpl.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ElementSchemeImpl.h	1 Sep 2005 07:34:08 -0000	1.3
  +++ ElementSchemeImpl.h	2 Sep 2005 10:03:14 -0000	1.4
  @@ -25,7 +25,7 @@
   
   #include <kdom/xpointer/impl/PointerPartImpl.h>
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   #include <qstringlist.h>
   
   namespace KDOM
  @@ -56,7 +56,7 @@
           void parseChildSequence(const QStringList &steps);
   
           ShortHandImpl *m_shorthand;
  -        QValueList<unsigned int> m_childSequence;
  +        Q3ValueList<unsigned int> m_childSequence;
       };
   };
   
  
  
  
  1.4       +2 -2      SVGSupport/kdom/xpointer/impl/XPointerEvaluatorImpl.cpp
  
  Index: XPointerEvaluatorImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpointer/impl/XPointerEvaluatorImpl.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XPointerEvaluatorImpl.cpp	1 Sep 2005 07:34:08 -0000	1.3
  +++ XPointerEvaluatorImpl.cpp	2 Sep 2005 10:03:14 -0000	1.4
  @@ -23,7 +23,7 @@
   #include <qmap.h>
   #include <qpair.h>
   #include <qstring.h>
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   #include <kdebug.h>
   
  @@ -104,7 +104,7 @@
       typedef QPair<DOMString, DOMString> StrPair;
       
       /* A list of pair of SchemeName and SchemeData, all valid. */
  -    typedef QValueList<StrPair> StrPairList;
  +    typedef Q3ValueList<StrPair> StrPairList;
       StrPairList pointerParts;
   
       for(unsigned int i = 0; i < length; i++)
  
  
  
  1.4       +1 -1      SVGSupport/kdom/xpointer/impl/XPointerExpressionImpl.cpp
  
  Index: XPointerExpressionImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpointer/impl/XPointerExpressionImpl.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XPointerExpressionImpl.cpp	1 Sep 2005 07:34:09 -0000	1.3
  +++ XPointerExpressionImpl.cpp	2 Sep 2005 10:03:14 -0000	1.4
  @@ -20,7 +20,7 @@
    *
    */
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   #include "kdom/Shared.h"
   #include "NodeImpl.h"
  
  
  
  1.4       +2 -2      SVGSupport/kdom/xpointer/impl/XPointerExpressionImpl.h
  
  Index: XPointerExpressionImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/kdom/xpointer/impl/XPointerExpressionImpl.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XPointerExpressionImpl.h	1 Sep 2005 07:34:09 -0000	1.3
  +++ XPointerExpressionImpl.h	2 Sep 2005 10:03:14 -0000	1.4
  @@ -23,7 +23,7 @@
   #ifndef KDOM_XPointer_XPointerExpressionImpl_H
   #define KDOM_XPointer_XPointerExpressionImpl_H
   
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   #include <kdom/Shared.h>
   
  @@ -42,7 +42,7 @@
       class XPointerExpressionImpl : public Shared
       {
       public:
  -        typedef QValueList<PointerPartImpl *> List;
  +        typedef Q3ValueList<PointerPartImpl *> List;
   
           XPointerExpressionImpl(DOMStringImpl *raw, NodeImpl *relatedNode, DocumentImpl *context);
           virtual ~XPointerExpressionImpl();
  
  
  
  1.5       +3 -3      SVGSupport/ksvg2/KSVGFactory.cpp
  
  Index: KSVGFactory.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/KSVGFactory.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KSVGFactory.cpp	1 Sep 2005 07:34:14 -0000	1.4
  +++ KSVGFactory.cpp	2 Sep 2005 10:03:15 -0000	1.5
  @@ -48,7 +48,7 @@
   KInstance *KSVGFactory::s_instance = 0;
   KAboutData *KSVGFactory::s_about = 0;
   KSVGSettings *KSVGFactory::s_settings = 0;
  -QPtrList<KSVGPart> *KSVGFactory::s_parts = 0;
  +Q3PtrList<KSVGPart> *KSVGFactory::s_parts = 0;
   
   KSVGFactory::KSVGFactory(bool clone)
   {
  @@ -94,7 +94,7 @@
       bool dummy;
       QRegExp r1(QString::fromLatin1("(WIDTH)(\\s*=\\s*\")(\\d+)(\\w*)(\")"));
       QRegExp r2(QString::fromLatin1("(HEIGHT)(\\s*=\\s*\")(\\d+)(\\w*)(\")"));
  -    for(QValueListConstIterator<QString> it = args.begin(); it != args.end(); ++it) 
  +    for(Q3ValueListConstIterator<QString> it = args.begin(); it != args.end(); ++it) 
       {
           if(r1.search(*it) > -1)
               width = r1.cap(3).toUInt(&dummy);
  @@ -137,7 +137,7 @@
   void KSVGFactory::registerPart(KSVGPart *part)
   {
       if(!s_parts)
  -        s_parts = new QPtrList<KSVGPart>();
  +        s_parts = new Q3PtrList<KSVGPart>();
   
       if(!s_parts->containsRef(part))
       {
  
  
  
  1.3       +3 -3      SVGSupport/ksvg2/KSVGFactory.h
  
  Index: KSVGFactory.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/KSVGFactory.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- KSVGFactory.h	1 Sep 2005 07:34:14 -0000	1.2
  +++ KSVGFactory.h	2 Sep 2005 10:03:15 -0000	1.3
  @@ -24,7 +24,7 @@
   #define KSVG_KSVGFactory_H
   
   #include <kurl.h>
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kparts/factory.h>
   #include <kparts/historyprovider.h>
  @@ -49,7 +49,7 @@
           static void registerPart(KSVGPart *part);
           static void deregisterPart(KSVGPart *part);
   
  -        static QPtrList<KSVGPart> *partList() { return s_parts; }
  +        static Q3PtrList<KSVGPart> *partList() { return s_parts; }
   
           static KInstance *instance();
           static KSVGSettings *defaultSVGSettings();
  @@ -72,7 +72,7 @@
           static KAboutData *s_about;
           static KSVGSettings *s_settings;
           
  -        static QPtrList<KSVGPart> *s_parts;
  +        static Q3PtrList<KSVGPart> *s_parts;
       };
   }
   
  
  
  
  1.6       +1 -1      SVGSupport/ksvg2/css/KSVGCSSParser.cpp
  
  Index: KSVGCSSParser.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/css/KSVGCSSParser.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- KSVGCSSParser.cpp	1 Sep 2005 09:39:12 -0000	1.5
  +++ KSVGCSSParser.cpp	2 Sep 2005 10:03:15 -0000	1.6
  @@ -509,7 +509,7 @@
       return ret;
   }
   
  -CSSStyleDeclarationImpl *SVGCSSParser::createCSSStyleDeclaration(CSSStyleRuleImpl *rule, QPtrList<CSSProperty> *propList)
  +CSSStyleDeclarationImpl *SVGCSSParser::createCSSStyleDeclaration(CSSStyleRuleImpl *rule, Q3PtrList<CSSProperty> *propList)
   {
       return new SVGCSSStyleDeclarationImpl(document()->implementation()->cdfInterface(), rule, propList);
   }
  
  
  
  1.5       +1 -1      SVGSupport/ksvg2/css/KSVGCSSParser.h
  
  Index: KSVGCSSParser.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/css/KSVGCSSParser.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KSVGCSSParser.h	1 Sep 2005 09:39:12 -0000	1.4
  +++ KSVGCSSParser.h	2 Sep 2005 10:03:15 -0000	1.5
  @@ -41,7 +41,7 @@
   
           virtual bool parseShape(int propId, bool important);
   
  -        virtual KDOM::CSSStyleDeclarationImpl *createCSSStyleDeclaration(KDOM::CSSStyleRuleImpl *rule, QPtrList<KDOM::CSSProperty> *propList);
  +        virtual KDOM::CSSStyleDeclarationImpl *createCSSStyleDeclaration(KDOM::CSSStyleRuleImpl *rule, Q3PtrList<KDOM::CSSProperty> *propList);
       };
   }
   
  
  
  
  1.5       +1 -1      SVGSupport/ksvg2/css/SVGCSSStyleDeclarationImpl.cpp
  
  Index: SVGCSSStyleDeclarationImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/css/SVGCSSStyleDeclarationImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGCSSStyleDeclarationImpl.cpp	1 Sep 2005 09:39:12 -0000	1.4
  +++ SVGCSSStyleDeclarationImpl.cpp	2 Sep 2005 10:03:15 -0000	1.5
  @@ -36,7 +36,7 @@
   {
   }
   
  -SVGCSSStyleDeclarationImpl::SVGCSSStyleDeclarationImpl(KDOM::CDFInterface *interface, KDOM::CSSRuleImpl *parent, QPtrList<KDOM::CSSProperty> *lstValues)
  +SVGCSSStyleDeclarationImpl::SVGCSSStyleDeclarationImpl(KDOM::CDFInterface *interface, KDOM::CSSRuleImpl *parent, Q3PtrList<KDOM::CSSProperty> *lstValues)
   : KDOM::CSSStyleDeclarationImpl(interface, parent, lstValues)
   {
   }
  
  
  
  1.5       +1 -1      SVGSupport/ksvg2/css/SVGCSSStyleDeclarationImpl.h
  
  Index: SVGCSSStyleDeclarationImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/css/SVGCSSStyleDeclarationImpl.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGCSSStyleDeclarationImpl.h	1 Sep 2005 09:39:12 -0000	1.4
  +++ SVGCSSStyleDeclarationImpl.h	2 Sep 2005 10:03:15 -0000	1.5
  @@ -37,7 +37,7 @@
       {
       public:
           SVGCSSStyleDeclarationImpl(KDOM::CDFInterface *interface, KDOM::CSSRuleImpl *parentRule);
  -        SVGCSSStyleDeclarationImpl(KDOM::CDFInterface *interface, KDOM::CSSRuleImpl *parentRule, QPtrList<KDOM::CSSProperty> *lstValues);
  +        SVGCSSStyleDeclarationImpl(KDOM::CDFInterface *interface, KDOM::CSSRuleImpl *parentRule, Q3PtrList<KDOM::CSSProperty> *lstValues);
           virtual ~SVGCSSStyleDeclarationImpl();
   
           SVGCSSStyleDeclarationImpl &operator=(const SVGCSSStyleDeclarationImpl &other);
  
  
  
  1.6       +2 -2      SVGSupport/ksvg2/css/SVGCSSStyleSelector.cpp
  
  Index: SVGCSSStyleSelector.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/css/SVGCSSStyleSelector.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGCSSStyleSelector.cpp	1 Sep 2005 09:39:12 -0000	1.5
  +++ SVGCSSStyleSelector.cpp	2 Sep 2005 10:03:15 -0000	1.6
  @@ -141,7 +141,7 @@
       QFile f(locate("data", QString::fromLatin1("ksvg2/svg.css")));
       f.open(IO_ReadOnly);
   
  -    QCString file(f.size() + 1);
  +    Q3CString file(f.size() + 1);
       int readbytes = f.readBlock(file.data(), f.size());
       f.close();
       if(readbytes >= 0)
  @@ -171,7 +171,7 @@
       if(!decl)
           return numProps;
   
  -    QPtrList<KDOM::CSSProperty>* values = decl ? decl->values() : 0;
  +    Q3PtrList<KDOM::CSSProperty>* values = decl ? decl->values() : 0;
       if(!values)
           return numProps;
   
  
  
  
  1.5       +1 -1      SVGSupport/ksvg2/css/SVGCSSStyleSelector.h
  
  Index: SVGCSSStyleSelector.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/css/SVGCSSStyleSelector.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGCSSStyleSelector.h	1 Sep 2005 09:39:12 -0000	1.4
  +++ SVGCSSStyleSelector.h	2 Sep 2005 10:03:15 -0000	1.5
  @@ -76,7 +76,7 @@
       protected:
           virtual unsigned int addExtraDeclarations(KDOM::ElementImpl *e, unsigned int numProps);
   
  -        QMemArray<KDOM::CSSOrderedProperty> presentationAttrs;
  +        Q3MemArray<KDOM::CSSOrderedProperty> presentationAttrs;
   
           void loadDefaultStyle(KDOM::DocumentImpl *doc);
   
  
  
  
  1.6       +3 -3      SVGSupport/ksvg2/misc/KCanvasRenderingStyle.cpp
  
  Index: KCanvasRenderingStyle.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/misc/KCanvasRenderingStyle.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- KCanvasRenderingStyle.cpp	1 Sep 2005 09:39:14 -0000	1.5
  +++ KCanvasRenderingStyle.cpp	2 Sep 2005 10:03:16 -0000	1.6
  @@ -20,7 +20,7 @@
       Boston, MA 02111-1307, USA.
   */
   
  -#include <qpaintdevicemetrics.h>
  +#include <q3paintdevicemetrics.h>
   #include <qpaintdevice.h>
   
   #include <kcanvas/KCanvas.h>
  @@ -139,7 +139,7 @@
       if(dashes)
       {
           KDOM::CSSPrimitiveValueImpl *dash = 0;
  -        QPaintDeviceMetrics *paintDeviceMetrics = 0;
  +        Q3PaintDeviceMetrics *paintDeviceMetrics = 0;
   
           SVGElementImpl *element = static_cast<SVGElementImpl *>(item->userData());
           if(element && element->ownerDocument())
  @@ -191,7 +191,7 @@
       if(!(cssType > KDOM::CSS_UNKNOWN && cssType <= KDOM::CSS_PC))
           return defaultValue;
   
  -    QPaintDeviceMetrics *paintDeviceMetrics = 0;
  +    Q3PaintDeviceMetrics *paintDeviceMetrics = 0;
   
       SVGElementImpl *element = static_cast<SVGElementImpl *>(item->userData());
       if(element && element->ownerDocument())
  
  
  
  1.5       +4 -4      SVGSupport/ksvg2/misc/KSVGTimeScheduler.cpp
  
  Index: KSVGTimeScheduler.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/misc/KSVGTimeScheduler.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KSVGTimeScheduler.cpp	1 Sep 2005 07:34:15 -0000	1.4
  +++ KSVGTimeScheduler.cpp	2 Sep 2005 10:03:16 -0000	1.5
  @@ -129,7 +129,7 @@
       // First build a list of animation elements per target element
       // This is important to decide about the order & priority of 
       // the animations -> 'additive' support is handled this way.
  -    typedef QMap<SVGElementImpl *, QPtrList<SVGAnimationElementImpl> > TargetAnimationMap;
  +    typedef QMap<SVGElementImpl *, Q3PtrList<SVGAnimationElementImpl> > TargetAnimationMap;
       TargetAnimationMap targetMap;
       
       for(unsigned int i = m_notifyList.count(); i > 0; i--)
  @@ -157,7 +157,7 @@
           SVGElementImpl *target = const_cast<SVGElementImpl *>(animation->targetElement());
           if(!targetMap.contains(target))
           {
  -            QPtrList<SVGAnimationElementImpl> list;
  +            Q3PtrList<SVGAnimationElementImpl> list;
               list.append(animation);
                   
               targetMap.insert(target, list);
  @@ -171,8 +171,8 @@
   
       for(; tit != tend; ++tit)
       {
  -        QPtrList<SVGAnimationElementImpl>::Iterator it = tit.data().begin();
  -        QPtrList<SVGAnimationElementImpl>::Iterator end = tit.data().end();
  +        Q3PtrList<SVGAnimationElementImpl>::Iterator it = tit.data().begin();
  +        Q3PtrList<SVGAnimationElementImpl>::Iterator end = tit.data().end();
   
           QMap<QString, QColor> targetColor; // special <animateColor> case
           SVGTransformListImpl *targetTransforms = 0; // special <animateTransform> case    
  
  
  
  1.5       +3 -3      SVGSupport/ksvg2/misc/KSVGTimeScheduler.h
  
  Index: KSVGTimeScheduler.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/misc/KSVGTimeScheduler.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KSVGTimeScheduler.h	1 Sep 2005 07:34:15 -0000	1.4
  +++ KSVGTimeScheduler.h	2 Sep 2005 10:03:16 -0000	1.5
  @@ -26,7 +26,7 @@
   #include <qtimer.h>
   #include <qobject.h>
   #include <qdatetime.h>
  -#include <qvaluelist.h>
  +#include <q3valuelist.h>
   
   #include "SVGAnimationElementImpl.h"
   
  @@ -38,7 +38,7 @@
           SVGAnimationElementImpl *animation;
       } SVGNotificationStruct;
       
  -    typedef QValueList<SVGNotificationStruct> SVGNotifyList;
  +    typedef Q3ValueList<SVGNotificationStruct> SVGNotifyList;
   
       class TimeScheduler;
       class SVGTimer
  @@ -73,7 +73,7 @@
           SVGNotifyList m_notifyList;
       };
   
  -    typedef QValueList<SVGTimer *> SVGTimerList;
  +    typedef Q3ValueList<SVGTimer *> SVGTimerList;
   
       class SVGDocumentImpl;
       class TimeScheduler : public QObject
  
  
  
  1.6       +4 -4      SVGSupport/ksvg2/svg/SVGDocumentImpl.cpp
  
  Index: SVGDocumentImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGDocumentImpl.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGDocumentImpl.cpp	1 Sep 2005 09:39:15 -0000	1.5
  +++ SVGDocumentImpl.cpp	2 Sep 2005 10:03:17 -0000	1.6
  @@ -22,7 +22,7 @@
   
   #include <assert.h>
   
  -#include <qdict.h>
  +#include <q3dict.h>
   
   #include <kurl.h>
   #include <klocale.h>
  @@ -546,7 +546,7 @@
   {
       addScripts(rootElement());
   
  -    m_scriptsIt = new QPtrListIterator<SVGScriptElementImpl>(m_scripts);
  +    m_scriptsIt = new Q3PtrListIterator<SVGScriptElementImpl>(m_scripts);
       executeScripts(false);
   }
   
  @@ -622,7 +622,7 @@
   
       QString sheetUsed; // Empty sheet
   
  -    QPtrList<KDOM::StyleSheetImpl> oldStyleSheets = m_styleSheets->styleSheets;
  +    Q3PtrList<KDOM::StyleSheetImpl> oldStyleSheets = m_styleSheets->styleSheets;
       m_styleSheets->styleSheets.clear();
   
       for(int i = 0; i < 2; i++)
  @@ -711,7 +711,7 @@
       }
   
       // De-reference all the stylesheets in the old list
  -    QPtrListIterator<KDOM::StyleSheetImpl> it(oldStyleSheets);
  +    Q3PtrListIterator<KDOM::StyleSheetImpl> it(oldStyleSheets);
       for(;it.current(); ++it)
           it.current()->deref();
   
  
  
  
  1.6       +3 -3      SVGSupport/ksvg2/svg/SVGDocumentImpl.h
  
  Index: SVGDocumentImpl.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGDocumentImpl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGDocumentImpl.h	1 Sep 2005 09:39:15 -0000	1.5
  +++ SVGDocumentImpl.h	2 Sep 2005 10:03:17 -0000	1.6
  @@ -23,7 +23,7 @@
   #ifndef KSVG_SVGDocumentImpl_H
   #define KSVG_SVGDocumentImpl_H
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   
   #include <kdom/core/DocumentImpl.h>
   #include <kdom/cache/KDOMCachedScript.h>
  @@ -116,8 +116,8 @@
           void addScripts(KDOM::NodeImpl *obj);
   
           KDOM::CachedScript *m_cachedScript;
  -        QPtrList<SVGScriptElementImpl> m_scripts;
  -        QPtrListIterator<SVGScriptElementImpl> *m_scriptsIt;
  +        Q3PtrList<SVGScriptElementImpl> m_scripts;
  +        Q3PtrListIterator<SVGScriptElementImpl> *m_scriptsIt;
       };
   };
   
  
  
  
  1.6       +1 -1      SVGSupport/ksvg2/svg/SVGFEColorMatrixElementImpl.cpp
  
  Index: SVGFEColorMatrixElementImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGFEColorMatrixElementImpl.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGFEColorMatrixElementImpl.cpp	1 Sep 2005 09:39:15 -0000	1.5
  +++ SVGFEColorMatrixElementImpl.cpp	2 Sep 2005 10:03:17 -0000	1.6
  @@ -120,7 +120,7 @@
       m_filterEffect = static_cast<KCanvasFEColorMatrix *>(canvas->renderingDevice()->createFilterEffect(FE_COLOR_MATRIX));
       m_filterEffect->setIn(KDOM::DOMString(in1()->baseVal()).string());
       setStandardAttributes(m_filterEffect);
  -    QValueList<float> _values;
  +    Q3ValueList<float> _values;
       SVGNumberListImpl *numbers = values()->baseVal();
       unsigned int nr = numbers->numberOfItems();
       for(unsigned int i = 0;i < nr;i++)
  
  
  
  1.5       +1 -1      SVGSupport/ksvg2/svg/SVGList.h
  
  Index: SVGList.h
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGList.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGList.h	1 Sep 2005 09:39:16 -0000	1.4
  +++ SVGList.h	2 Sep 2005 10:03:18 -0000	1.5
  @@ -23,7 +23,7 @@
   #ifndef KSVG_SVGList_H
   #define KSVG_SVGList_H
   
  -#include <qptrlist.h>
  +#include <q3ptrlist.h>
   #include <kdom/core/DOMList.h>
   #include <ksvg2/svg/SVGStyledElementImpl.h>
   
  
  
  
  1.6       +3 -3      SVGSupport/ksvg2/svg/SVGSVGElementImpl.cpp
  
  Index: SVGSVGElementImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGSVGElementImpl.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGSVGElementImpl.cpp	1 Sep 2005 09:39:16 -0000	1.5
  +++ SVGSVGElementImpl.cpp	2 Sep 2005 10:03:18 -0000	1.6
  @@ -55,7 +55,7 @@
   #include "SVGAnimatedLengthImpl.h"
   #include "KCanvasRenderingStyle.h"
   
  -#include <qpaintdevicemetrics.h>
  +#include <q3paintdevicemetrics.h>
   
   using namespace KSVG;
   
  @@ -169,7 +169,7 @@
   #ifndef APPLE_COMPILE_HACK
       if(ownerDocument() && ownerDocument()->paintDeviceMetrics())
       {
  -        QPaintDeviceMetrics *metrics = ownerDocument()->paintDeviceMetrics();
  +        Q3PaintDeviceMetrics *metrics = ownerDocument()->paintDeviceMetrics();
           return float(metrics->widthMM()) / float(metrics->width());
       }
   #endif
  @@ -182,7 +182,7 @@
   #ifndef APPLE_COMPILE_HACK
       if(ownerDocument() && ownerDocument()->paintDeviceMetrics())
       {
  -        QPaintDeviceMetrics *metrics = ownerDocument()->paintDeviceMetrics();
  +        Q3PaintDeviceMetrics *metrics = ownerDocument()->paintDeviceMetrics();
           return float(metrics->heightMM()) / float(metrics->height());
       }
   #endif
  
  
  
  1.27      +2 -0      WebCore/kwq/KWQCString.h
  
  Index: KWQCString.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQCString.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- KWQCString.h	10 May 2003 05:46:59 -0000	1.26
  +++ KWQCString.h	2 Sep 2005 10:03:19 -0000	1.27
  @@ -73,4 +73,6 @@
   inline bool operator!=(const QCString &s1, const char *s2) { return !(s1 == s2); }
   inline bool operator!=(const char *s1, const QCString &s2) { return !(s1 == s2); }
   
  +typedef QCString Q3CString;
  +
   #endif
  
  
  
  1.11      +2 -0      WebCore/kwq/KWQCollection.h
  
  Index: KWQCollection.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQCollection.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- KWQCollection.h	22 Jan 2003 00:12:34 -0000	1.10
  +++ KWQCollection.h	2 Sep 2005 10:03:19 -0000	1.11
  @@ -45,4 +45,6 @@
       bool del_item;
   };
   
  +#define Q3PtrCollection QPtrCollection
  +
   #endif
  
  
  
  1.22      +3 -0      WebCore/kwq/KWQDict.h
  
  Index: KWQDict.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQDict.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- KWQDict.h	23 Jun 2005 21:25:49 -0000	1.21
  +++ KWQDict.h	2 Sep 2005 10:03:19 -0000	1.22
  @@ -74,4 +74,7 @@
       KWQDictIteratorImpl impl;
   };
   
  +#define Q3Dict QDict
  +#define Q3DictIterator QDictIterator
  +
   #endif
  
  
  
  1.3       +2 -0      WebCore/kwq/KWQIntDict.h
  
  Index: KWQIntDict.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQIntDict.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- KWQIntDict.h	3 Jul 2005 09:38:02 -0000	1.2
  +++ KWQIntDict.h	2 Sep 2005 10:03:19 -0000	1.3
  @@ -58,6 +58,8 @@
       QIntDictIterator &operator=(const QIntDictIterator &);
   };
   
  +#define Q3IntDict QIntDict
  +#define Q3IntDictIterator QIntDictIterator
   
   #endif
   
  
  
  
  1.27      +2 -0      WebCore/kwq/KWQMemArray.h
  
  Index: KWQMemArray.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQMemArray.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- KWQMemArray.h	23 Jun 2005 21:25:49 -0000	1.26
  +++ KWQMemArray.h	2 Sep 2005 10:03:19 -0000	1.27
  @@ -62,6 +62,8 @@
       KWQArrayImpl impl;
   };
   
  +#define Q3MemArray QMemArray
  +
   #ifdef _KWQ_IOSTREAM_
   
   template<class T>
  
  
  
  1.12      +2 -0      WebCore/kwq/KWQPaintDeviceMetrics.h
  
  Index: KWQPaintDeviceMetrics.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQPaintDeviceMetrics.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- KWQPaintDeviceMetrics.h	4 Apr 2003 16:56:02 -0000	1.11
  +++ KWQPaintDeviceMetrics.h	2 Sep 2005 10:03:19 -0000	1.12
  @@ -36,4 +36,6 @@
       int depth() const;
   };
   
  +#define Q3PaintDeviceMetrics QPaintDeviceMetrics
  +
   #endif
  
  
  
  1.30      +3 -0      WebCore/kwq/KWQPtrList.h
  
  Index: KWQPtrList.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQPtrList.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- KWQPtrList.h	5 Jul 2005 07:13:03 -0000	1.29
  +++ KWQPtrList.h	2 Sep 2005 10:03:19 -0000	1.30
  @@ -109,6 +109,9 @@
       KWQListIteratorImpl impl;
   };
   
  +#define Q3PtrList QPtrList
  +#define Q3PtrListIterator QPtrListIterator
  +
   #ifdef _KWQ_IOSTREAM_
   
   template<class T>
  
  
  
  1.16      +2 -0      WebCore/kwq/KWQPtrStack.h
  
  Index: KWQPtrStack.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQPtrStack.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- KWQPtrStack.h	22 Jan 2004 02:30:52 -0000	1.15
  +++ KWQPtrStack.h	2 Sep 2005 10:03:20 -0000	1.16
  @@ -45,6 +45,8 @@
   
   };
   
  +#define Q3PtrStack QPtrStack
  +
   #ifdef _KWQ_IOSTREAM_
   
   template<class T>
  
  
  
  1.34      +4 -0      WebCore/kwq/KWQValueList.h
  
  Index: KWQValueList.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQValueList.h,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- KWQValueList.h	3 Jul 2005 09:58:32 -0000	1.33
  +++ KWQValueList.h	2 Sep 2005 10:03:20 -0000	1.34
  @@ -171,4 +171,8 @@
   
   #endif
   
  +#define Q3ValueList QValueList
  +#define Q3ValueListIterator QValueListIterator
  +#define Q3ValueListConstIterator QValueListConstIterator
  +
   #endif
  
  
  
  1.2       +2 -0      WebCore/kwq/KWQValueVector.h
  
  Index: KWQValueVector.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQValueVector.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- KWQValueVector.h	7 Jul 2005 06:31:24 -0000	1.1
  +++ KWQValueVector.h	2 Sep 2005 10:03:20 -0000	1.2
  @@ -33,5 +33,7 @@
   
   };
   
  +#define Q3ValueVector QValueVector
  +
   #endif
   
  
  
  



More information about the webkit-changes mailing list