[webkit-changes] cvs commit: WebCore/kwq DOMHTML.h DOMHTML.mm KWQAccObject.mm KWQKHTMLPart.mm WebCoreBridge.mm

David hyatt at opensource.apple.com
Mon Jul 18 14:44:34 PDT 2005


hyatt       05/07/18 14:44:32

  Modified:    .        ChangeLog
               WebCore.pbproj project.pbxproj
               khtml    khtml_part.cpp khtmlview.cpp
               khtml/css css_base.cpp css_base.h css_ruleimpl.cpp
                        css_stylesheetimpl.cpp cssparser.cpp
                        cssstyleselector.cpp parser.y
               khtml/dom css_stylesheet.cpp html_base.cpp html_block.cpp
                        html_document.cpp html_element.cpp html_form.cpp
                        html_head.cpp html_image.cpp html_inline.cpp
                        html_list.cpp html_misc.cpp html_object.cpp
                        html_table.cpp
               khtml/ecma kjs_html.cpp
               khtml/editing apply_style_command.cpp
                        composite_edit_command.cpp composite_edit_command.h
                        delete_selection_command.cpp htmlediting.cpp
                        markup.cpp remove_node_attribute_command.cpp
                        remove_node_attribute_command.h
                        replace_selection_command.cpp
                        set_node_attribute_command.cpp
                        set_node_attribute_command.h
               khtml/html html_baseimpl.cpp html_baseimpl.h
                        html_blockimpl.cpp html_blockimpl.h
                        html_canvasimpl.cpp html_canvasimpl.h
                        html_documentimpl.cpp html_elementimpl.cpp
                        html_elementimpl.h html_formimpl.cpp
                        html_formimpl.h html_headimpl.cpp
                        html_imageimpl.cpp html_imageimpl.h
                        html_inlineimpl.cpp html_inlineimpl.h
                        html_listimpl.cpp html_listimpl.h html_miscimpl.cpp
                        html_miscimpl.h html_objectimpl.cpp
                        html_objectimpl.h html_tableimpl.cpp
                        html_tableimpl.h htmlnames.cpp htmlnames.h
                        htmlparser.cpp htmltokenizer.cpp htmltokenizer.h
               khtml/misc decoder.cpp
               khtml/rendering render_box.cpp render_canvasimage.cpp
                        render_form.cpp render_frames.cpp render_image.cpp
                        render_object.cpp render_table.cpp
               khtml/xbl xbl_tokenizer.cpp
               khtml/xml dom_docimpl.cpp dom_docimpl.h dom_elementimpl.cpp
                        dom_elementimpl.h dom_nodeimpl.cpp dom_nodeimpl.h
                        dom_qname.cpp dom_qname.h dom_textimpl.cpp
                        xml_tokenizer.cpp
               kwq      DOMHTML.h DOMHTML.mm KWQAccObject.mm
                        KWQKHTMLPart.mm WebCoreBridge.mm
  Removed:     ForwardingHeaders/misc htmlattrs.h htmlhashes.h
               khtml/misc htmlattrs.in htmlhashes.cpp htmlhashes.h
                        htmltags.in makeattrs maketags
  Log:
  	Fix for bugzilla bug 3927.  Convert attributes to use QualifiedName.
  
          Reviewed by mjs
  
          * WebCore.pbproj/project.pbxproj:
          * khtml/css/css_base.cpp:
          (CSSSelector::print):
          (CSSSelector::selectorText):
          * khtml/css/css_base.h:
          (DOM::CSSSelector::CSSSelector):
          (DOM::CSSSelector::hasTag):
          (DOM::CSSSelector::hasAttribute):
          * khtml/css/css_stylesheetimpl.cpp:
          (CSSStyleSheetImpl::determineNamespace):
          * khtml/css/cssparser.cpp:
          (CSSParser::parseContent):
          * khtml/css/cssstyleselector.cpp:
          (khtml::checkPseudoState):
          (khtml::CSSStyleSelector::canShareStyleWithElement):
          (khtml::CSSStyleSelector::checkOneSelector):
          (khtml::CSSStyleSelector::applyProperty):
          * khtml/css/parser.y:
          * khtml/dom/css_stylesheet.cpp:
          * khtml/dom/html_base.cpp:
          * khtml/dom/html_block.cpp:
          * khtml/dom/html_document.cpp:
          * khtml/dom/html_element.cpp:
          * khtml/dom/html_form.cpp:
          * khtml/dom/html_head.cpp:
          * khtml/dom/html_image.cpp:
          * khtml/dom/html_inline.cpp:
          * khtml/dom/html_list.cpp:
          * khtml/dom/html_misc.cpp:
          * khtml/dom/html_object.cpp:
          * khtml/dom/html_table.cpp:
          * khtml/ecma/kjs_html.cpp:
          (KJS::HTMLElement::inputGetter):
          (KJS::HTMLElement::inputSetter):
          * khtml/editing/apply_style_command.cpp:
          (khtml::isStyleSpan):
          (khtml::isEmptyStyleSpan):
          (khtml::isEmptyFontTag):
          (khtml::createFontElement):
          (khtml::createStyleSpanElement):
          (khtml::ApplyStyleCommand::applyRelativeFontStyleChange):
          (khtml::ApplyStyleCommand::removeHTMLFontStyle):
          (khtml::ApplyStyleCommand::applyTextDecorationStyle):
          (khtml::areIdenticalElements):
          (khtml::ApplyStyleCommand::addBlockStyleIfNeeded):
          (khtml::ApplyStyleCommand::addInlineStyleIfNeeded):
          * khtml/editing/composite_edit_command.cpp:
          (khtml::CompositeEditCommand::removeNodeAttribute):
          (khtml::CompositeEditCommand::setNodeAttribute):
          (khtml::CompositeEditCommand::findBlockPlaceholder):
          (khtml::createBlockPlaceholderElement):
          * khtml/editing/composite_edit_command.h:
          * khtml/editing/markup.cpp:
          (khtml::startMarkup):
          (khtml::completeURLs):
          (khtml::createFragmentFromText):
          * khtml/editing/remove_node_attribute_command.cpp:
          (khtml::RemoveNodeAttributeCommand::RemoveNodeAttributeCommand):
          * khtml/editing/remove_node_attribute_command.h:
          (khtml::RemoveNodeAttributeCommand::attribute):
          * khtml/editing/replace_selection_command.cpp:
          (khtml::ReplacementFragment::isInterchangeNewlineNode):
          (khtml::ReplacementFragment::isInterchangeConvertedSpaceSpan):
          * khtml/editing/set_node_attribute_command.cpp:
          (khtml::SetNodeAttributeCommand::SetNodeAttributeCommand):
          * khtml/editing/set_node_attribute_command.h:
          (khtml::SetNodeAttributeCommand::attribute):
          * khtml/html/html_baseimpl.cpp:
          (HTMLBodyElementImpl::mapToEntry):
          (HTMLBodyElementImpl::parseMappedAttribute):
          (HTMLBodyElementImpl::insertedIntoDocument):
          (HTMLBodyElementImpl::isURLAttribute):
          (HTMLBodyElementImpl::aLink):
          (HTMLBodyElementImpl::setALink):
          (HTMLBodyElementImpl::background):
          (HTMLBodyElementImpl::setBackground):
          (HTMLBodyElementImpl::bgColor):
          (HTMLBodyElementImpl::setBgColor):
          (HTMLBodyElementImpl::link):
          (HTMLBodyElementImpl::setLink):
          (HTMLBodyElementImpl::text):
          (HTMLBodyElementImpl::setText):
          (HTMLBodyElementImpl::vLink):
          (HTMLBodyElementImpl::setVLink):
          (HTMLFrameElementImpl::parseMappedAttribute):
          (HTMLFrameElementImpl::attach):
          (HTMLFrameElementImpl::isURLAttribute):
          (HTMLFrameElementImpl::frameBorder):
          (HTMLFrameElementImpl::setFrameBorder):
          (HTMLFrameElementImpl::longDesc):
          (HTMLFrameElementImpl::setLongDesc):
          (HTMLFrameElementImpl::marginHeight):
          (HTMLFrameElementImpl::setMarginHeight):
          (HTMLFrameElementImpl::marginWidth):
          (HTMLFrameElementImpl::setMarginWidth):
          (HTMLFrameElementImpl::name):
          (HTMLFrameElementImpl::setName):
          (HTMLFrameElementImpl::setNoResize):
          (HTMLFrameElementImpl::scrolling):
          (HTMLFrameElementImpl::setScrolling):
          (HTMLFrameElementImpl::src):
          (HTMLFrameElementImpl::setSrc):
          (HTMLFrameSetElementImpl::parseMappedAttribute):
          (HTMLFrameSetElementImpl::cols):
          (HTMLFrameSetElementImpl::setCols):
          (HTMLFrameSetElementImpl::rows):
          (HTMLFrameSetElementImpl::setRows):
          (HTMLHeadElementImpl::profile):
          (HTMLHeadElementImpl::setProfile):
          (HTMLHtmlElementImpl::version):
          (HTMLHtmlElementImpl::setVersion):
          (HTMLIFrameElementImpl::mapToEntry):
          (HTMLIFrameElementImpl::parseMappedAttribute):
          (HTMLIFrameElementImpl::attach):
          (HTMLIFrameElementImpl::isURLAttribute):
          (HTMLIFrameElementImpl::align):
          (HTMLIFrameElementImpl::setAlign):
          (HTMLIFrameElementImpl::height):
          (HTMLIFrameElementImpl::setHeight):
          (HTMLIFrameElementImpl::src):
          (HTMLIFrameElementImpl::width):
          (HTMLIFrameElementImpl::setWidth):
          * khtml/html/html_baseimpl.h:
          * khtml/html/html_blockimpl.cpp:
          (HTMLBlockquoteElementImpl::cite):
          (HTMLBlockquoteElementImpl::setCite):
          (HTMLDivElementImpl::mapToEntry):
          (HTMLDivElementImpl::parseMappedAttribute):
          (HTMLDivElementImpl::align):
          (HTMLDivElementImpl::setAlign):
          (HTMLHRElementImpl::mapToEntry):
          (HTMLHRElementImpl::parseMappedAttribute):
          (HTMLHRElementImpl::align):
          (HTMLHRElementImpl::setAlign):
          (HTMLHRElementImpl::noShade):
          (HTMLHRElementImpl::setNoShade):
          (HTMLHRElementImpl::size):
          (HTMLHRElementImpl::setSize):
          (HTMLHRElementImpl::width):
          (HTMLHRElementImpl::setWidth):
          (HTMLHeadingElementImpl::align):
          (HTMLHeadingElementImpl::setAlign):
          (HTMLParagraphElementImpl::mapToEntry):
          (HTMLParagraphElementImpl::parseMappedAttribute):
          (HTMLParagraphElementImpl::align):
          (HTMLParagraphElementImpl::setAlign):
          (HTMLPreElementImpl::width):
          (HTMLPreElementImpl::setWidth):
          (HTMLMarqueeElementImpl::mapToEntry):
          (HTMLMarqueeElementImpl::parseMappedAttribute):
          * khtml/html/html_blockimpl.h:
          * khtml/html/html_canvasimpl.cpp:
          (HTMLCanvasElementImpl::mapToEntry):
          (HTMLCanvasElementImpl::parseMappedAttribute):
          (HTMLCanvasElementImpl::isURLAttribute):
          * khtml/html/html_canvasimpl.h:
          * khtml/html/html_documentimpl.cpp:
          * khtml/html/html_elementimpl.cpp:
          (HTMLElementImpl::mapToEntry):
          (HTMLElementImpl::parseMappedAttribute):
          (HTMLElementImpl::setContentEditable):
          (HTMLElementImpl::id):
          (HTMLElementImpl::setId):
          (HTMLElementImpl::title):
          (HTMLElementImpl::setTitle):
          (HTMLElementImpl::lang):
          (HTMLElementImpl::setLang):
          (HTMLElementImpl::dir):
          (HTMLElementImpl::setDir):
          (HTMLElementImpl::className):
          (HTMLElementImpl::setClassName):
          * khtml/html/html_elementimpl.h:
          * khtml/html/html_formimpl.cpp:
          (DOM::HTMLFormElementImpl::parseMappedAttribute):
          (DOM::HTMLFormElementImpl::isURLAttribute):
          (DOM::HTMLFormElementImpl::name):
          (DOM::HTMLFormElementImpl::setName):
          (DOM::HTMLFormElementImpl::acceptCharset):
          (DOM::HTMLFormElementImpl::setAcceptCharset):
          (DOM::HTMLFormElementImpl::action):
          (DOM::HTMLFormElementImpl::setAction):
          (DOM::HTMLFormElementImpl::setEnctype):
          (DOM::HTMLFormElementImpl::method):
          (DOM::HTMLFormElementImpl::setMethod):
          (DOM::HTMLFormElementImpl::target):
          (DOM::HTMLFormElementImpl::setTarget):
          (DOM::HTMLGenericFormElementImpl::parseMappedAttribute):
          (DOM::HTMLGenericFormElementImpl::name):
          (DOM::HTMLGenericFormElementImpl::setName):
          (DOM::HTMLGenericFormElementImpl::setDisabled):
          (DOM::HTMLGenericFormElementImpl::setReadOnly):
          (DOM::HTMLGenericFormElementImpl::tabIndex):
          (DOM::HTMLGenericFormElementImpl::setTabIndex):
          (DOM::HTMLButtonElementImpl::type):
          (DOM::HTMLButtonElementImpl::parseMappedAttribute):
          (DOM::HTMLButtonElementImpl::accessKey):
          (DOM::HTMLButtonElementImpl::setAccessKey):
          (DOM::HTMLButtonElementImpl::value):
          (DOM::HTMLButtonElementImpl::setValue):
          (DOM::HTMLInputElementImpl::setType):
          (DOM::HTMLInputElementImpl::mapToEntry):
          (DOM::HTMLInputElementImpl::parseMappedAttribute):
          (DOM::HTMLInputElementImpl::attach):
          (DOM::HTMLInputElementImpl::altText):
          (DOM::HTMLInputElementImpl::value):
          (DOM::HTMLInputElementImpl::setValue):
          (DOM::HTMLInputElementImpl::isURLAttribute):
          (DOM::HTMLInputElementImpl::defaultValue):
          (DOM::HTMLInputElementImpl::setDefaultValue):
          (DOM::HTMLInputElementImpl::defaultChecked):
          (DOM::HTMLInputElementImpl::setDefaultChecked):
          (DOM::HTMLInputElementImpl::accept):
          (DOM::HTMLInputElementImpl::setAccept):
          (DOM::HTMLInputElementImpl::accessKey):
          (DOM::HTMLInputElementImpl::setAccessKey):
          (DOM::HTMLInputElementImpl::align):
          (DOM::HTMLInputElementImpl::setAlign):
          (DOM::HTMLInputElementImpl::alt):
          (DOM::HTMLInputElementImpl::setAlt):
          (DOM::HTMLInputElementImpl::setMaxLength):
          (DOM::HTMLInputElementImpl::setSize):
          (DOM::HTMLInputElementImpl::src):
          (DOM::HTMLInputElementImpl::setSrc):
          (DOM::HTMLInputElementImpl::useMap):
          (DOM::HTMLInputElementImpl::setUseMap):
          (DOM::HTMLLabelElementImpl::parseMappedAttribute):
          (DOM::HTMLLabelElementImpl::formElement):
          (DOM::HTMLLabelElementImpl::accessKey):
          (DOM::HTMLLabelElementImpl::setAccessKey):
          (DOM::HTMLLabelElementImpl::htmlFor):
          (DOM::HTMLLabelElementImpl::setHtmlFor):
          (DOM::HTMLLegendElementImpl::accessKey):
          (DOM::HTMLLegendElementImpl::setAccessKey):
          (DOM::HTMLLegendElementImpl::align):
          (DOM::HTMLLegendElementImpl::setAlign):
          (DOM::HTMLSelectElementImpl::parseMappedAttribute):
          (DOM::HTMLSelectElementImpl::reset):
          (DOM::HTMLSelectElementImpl::setMultiple):
          (DOM::HTMLSelectElementImpl::setSize):
          (DOM::HTMLKeygenElementImpl::parseMappedAttribute):
          (DOM::HTMLOptGroupElementImpl::label):
          (DOM::HTMLOptGroupElementImpl::setLabel):
          (DOM::HTMLOptionElementImpl::text):
          (DOM::HTMLOptionElementImpl::parseMappedAttribute):
          (DOM::HTMLOptionElementImpl::setValue):
          (DOM::HTMLOptionElementImpl::defaultSelected):
          (DOM::HTMLOptionElementImpl::setDefaultSelected):
          (DOM::HTMLOptionElementImpl::label):
          (DOM::HTMLOptionElementImpl::setLabel):
          (DOM::HTMLTextAreaElementImpl::parseMappedAttribute):
          (DOM::HTMLTextAreaElementImpl::accessKey):
          (DOM::HTMLTextAreaElementImpl::setAccessKey):
          (DOM::HTMLTextAreaElementImpl::setCols):
          (DOM::HTMLTextAreaElementImpl::setRows):
          (DOM::HTMLIsIndexElementImpl::parseMappedAttribute):
          (DOM::HTMLIsIndexElementImpl::prompt):
          (DOM::HTMLIsIndexElementImpl::setPrompt):
          * khtml/html/html_formimpl.h:
          * khtml/html/html_headimpl.cpp:
          (HTMLBaseElementImpl::parseMappedAttribute):
          (HTMLBaseElementImpl::setHref):
          (HTMLBaseElementImpl::setTarget):
          (HTMLLinkElementImpl::parseMappedAttribute):
          (HTMLLinkElementImpl::process):
          (HTMLLinkElementImpl::isURLAttribute):
          (HTMLLinkElementImpl::disabled):
          (HTMLLinkElementImpl::setDisabled):
          (HTMLLinkElementImpl::charset):
          (HTMLLinkElementImpl::setCharset):
          (HTMLLinkElementImpl::href):
          (HTMLLinkElementImpl::setHref):
          (HTMLLinkElementImpl::hreflang):
          (HTMLLinkElementImpl::setHreflang):
          (HTMLLinkElementImpl::media):
          (HTMLLinkElementImpl::setMedia):
          (HTMLLinkElementImpl::rel):
          (HTMLLinkElementImpl::setRel):
          (HTMLLinkElementImpl::rev):
          (HTMLLinkElementImpl::setRev):
          (HTMLLinkElementImpl::target):
          (HTMLLinkElementImpl::setTarget):
          (HTMLLinkElementImpl::type):
          (HTMLLinkElementImpl::setType):
          (HTMLMetaElementImpl::parseMappedAttribute):
          (HTMLMetaElementImpl::content):
          (HTMLMetaElementImpl::setContent):
          (HTMLMetaElementImpl::httpEquiv):
          (HTMLMetaElementImpl::setHttpEquiv):
          (HTMLMetaElementImpl::name):
          (HTMLMetaElementImpl::setName):
          (HTMLMetaElementImpl::scheme):
          (HTMLMetaElementImpl::setScheme):
          (HTMLScriptElementImpl::isURLAttribute):
          (HTMLScriptElementImpl::insertedIntoDocument):
          (HTMLScriptElementImpl::charset):
          (HTMLScriptElementImpl::setCharset):
          (HTMLScriptElementImpl::defer):
          (HTMLScriptElementImpl::setDefer):
          (HTMLScriptElementImpl::src):
          (HTMLScriptElementImpl::setSrc):
          (HTMLScriptElementImpl::type):
          (HTMLScriptElementImpl::setType):
          (HTMLStyleElementImpl::parseMappedAttribute):
          (HTMLStyleElementImpl::disabled):
          (HTMLStyleElementImpl::setDisabled):
          (HTMLStyleElementImpl::media):
          (HTMLStyleElementImpl::setMedia):
          (HTMLStyleElementImpl::type):
          (HTMLStyleElementImpl::setType):
          * khtml/html/html_imageimpl.cpp:
          (HTMLImageLoader::updateFromElement):
          (HTMLImageElementImpl::mapToEntry):
          (HTMLImageElementImpl::parseMappedAttribute):
          (HTMLImageElementImpl::altText):
          (HTMLImageElementImpl::width):
          (HTMLImageElementImpl::height):
          (HTMLImageElementImpl::isURLAttribute):
          (HTMLImageElementImpl::name):
          (HTMLImageElementImpl::setName):
          (HTMLImageElementImpl::align):
          (HTMLImageElementImpl::setAlign):
          (HTMLImageElementImpl::alt):
          (HTMLImageElementImpl::setAlt):
          (HTMLImageElementImpl::border):
          (HTMLImageElementImpl::setBorder):
          (HTMLImageElementImpl::setHeight):
          (HTMLImageElementImpl::hspace):
          (HTMLImageElementImpl::setHspace):
          (HTMLImageElementImpl::isMap):
          (HTMLImageElementImpl::setIsMap):
          (HTMLImageElementImpl::longDesc):
          (HTMLImageElementImpl::setLongDesc):
          (HTMLImageElementImpl::src):
          (HTMLImageElementImpl::setSrc):
          (HTMLImageElementImpl::useMap):
          (HTMLImageElementImpl::setUseMap):
          (HTMLImageElementImpl::vspace):
          (HTMLImageElementImpl::setVspace):
          (HTMLImageElementImpl::setWidth):
          (HTMLMapElementImpl::parseMappedAttribute):
          (HTMLMapElementImpl::name):
          (HTMLMapElementImpl::setName):
          (HTMLAreaElementImpl::parseMappedAttribute):
          (HTMLAreaElementImpl::accessKey):
          (HTMLAreaElementImpl::setAccessKey):
          (HTMLAreaElementImpl::alt):
          (HTMLAreaElementImpl::setAlt):
          (HTMLAreaElementImpl::coords):
          (HTMLAreaElementImpl::setCoords):
          (HTMLAreaElementImpl::href):
          (HTMLAreaElementImpl::setHref):
          (HTMLAreaElementImpl::noHref):
          (HTMLAreaElementImpl::setNoHref):
          (HTMLAreaElementImpl::shape):
          (HTMLAreaElementImpl::setShape):
          (HTMLAreaElementImpl::tabIndex):
          (HTMLAreaElementImpl::setTabIndex):
          (HTMLAreaElementImpl::target):
          (HTMLAreaElementImpl::setTarget):
          * khtml/html/html_imageimpl.h:
          * khtml/html/html_inlineimpl.cpp:
          (DOM::HTMLAnchorElementImpl::defaultEventHandler):
          (DOM::HTMLAnchorElementImpl::parseMappedAttribute):
          (DOM::HTMLAnchorElementImpl::isURLAttribute):
          (DOM::HTMLAnchorElementImpl::accessKey):
          (DOM::HTMLAnchorElementImpl::setAccessKey):
          (DOM::HTMLAnchorElementImpl::charset):
          (DOM::HTMLAnchorElementImpl::setCharset):
          (DOM::HTMLAnchorElementImpl::coords):
          (DOM::HTMLAnchorElementImpl::setCoords):
          (DOM::HTMLAnchorElementImpl::href):
          (DOM::HTMLAnchorElementImpl::setHref):
          (DOM::HTMLAnchorElementImpl::hreflang):
          (DOM::HTMLAnchorElementImpl::setHreflang):
          (DOM::HTMLAnchorElementImpl::name):
          (DOM::HTMLAnchorElementImpl::setName):
          (DOM::HTMLAnchorElementImpl::rel):
          (DOM::HTMLAnchorElementImpl::setRel):
          (DOM::HTMLAnchorElementImpl::rev):
          (DOM::HTMLAnchorElementImpl::setRev):
          (DOM::HTMLAnchorElementImpl::shape):
          (DOM::HTMLAnchorElementImpl::setShape):
          (DOM::HTMLAnchorElementImpl::tabIndex):
          (DOM::HTMLAnchorElementImpl::setTabIndex):
          (DOM::HTMLAnchorElementImpl::target):
          (DOM::HTMLAnchorElementImpl::setTarget):
          (DOM::HTMLAnchorElementImpl::type):
          (DOM::HTMLAnchorElementImpl::setType):
          (DOM::HTMLBRElementImpl::mapToEntry):
          (DOM::HTMLBRElementImpl::parseMappedAttribute):
          (DOM::HTMLBRElementImpl::clear):
          (DOM::HTMLBRElementImpl::setClear):
          (DOM::HTMLFontElementImpl::mapToEntry):
          (DOM::HTMLFontElementImpl::parseMappedAttribute):
          (DOM::HTMLFontElementImpl::color):
          (DOM::HTMLFontElementImpl::setColor):
          (DOM::HTMLFontElementImpl::face):
          (DOM::HTMLFontElementImpl::setFace):
          (DOM::HTMLFontElementImpl::size):
          (DOM::HTMLFontElementImpl::setSize):
          (DOM::HTMLModElementImpl::cite):
          (DOM::HTMLModElementImpl::setCite):
          (DOM::HTMLModElementImpl::dateTime):
          (DOM::HTMLModElementImpl::setDateTime):
          (DOM::HTMLQuoteElementImpl::cite):
          (DOM::HTMLQuoteElementImpl::setCite):
          * khtml/html/html_inlineimpl.h:
          * khtml/html/html_listimpl.cpp:
          (DOM::HTMLUListElementImpl::mapToEntry):
          (DOM::HTMLUListElementImpl::parseMappedAttribute):
          (DOM::HTMLUListElementImpl::compact):
          (DOM::HTMLUListElementImpl::setCompact):
          (DOM::HTMLUListElementImpl::type):
          (DOM::HTMLUListElementImpl::setType):
          (DOM::HTMLDirectoryElementImpl::compact):
          (DOM::HTMLDirectoryElementImpl::setCompact):
          (DOM::HTMLMenuElementImpl::compact):
          (DOM::HTMLMenuElementImpl::setCompact):
          (DOM::HTMLOListElementImpl::mapToEntry):
          (DOM::HTMLOListElementImpl::parseMappedAttribute):
          (DOM::HTMLOListElementImpl::compact):
          (DOM::HTMLOListElementImpl::setCompact):
          (DOM::HTMLOListElementImpl::setStart):
          (DOM::HTMLOListElementImpl::type):
          (DOM::HTMLOListElementImpl::setType):
          (DOM::HTMLLIElementImpl::mapToEntry):
          (DOM::HTMLLIElementImpl::parseMappedAttribute):
          (DOM::HTMLLIElementImpl::type):
          (DOM::HTMLLIElementImpl::setType):
          (DOM::HTMLLIElementImpl::value):
          (DOM::HTMLLIElementImpl::setValue):
          (DOM::HTMLDListElementImpl::compact):
          (DOM::HTMLDListElementImpl::setCompact):
          * khtml/html/html_listimpl.h:
          * khtml/html/html_miscimpl.cpp:
          (DOM::HTMLBaseFontElementImpl::color):
          (DOM::HTMLBaseFontElementImpl::setColor):
          (DOM::HTMLBaseFontElementImpl::face):
          (DOM::HTMLBaseFontElementImpl::setFace):
          (DOM::HTMLBaseFontElementImpl::size):
          (DOM::HTMLBaseFontElementImpl::setSize):
          (DOM::HTMLCollectionImpl::traverseNextItem):
          (DOM::HTMLCollectionImpl::checkForNameMatch):
          (DOM::HTMLCollectionImpl::updateNameCache):
          (DOM::HTMLFormCollectionImpl::getNamedItem):
          (DOM::HTMLFormCollectionImpl::getNamedFormItem):
          (DOM::HTMLFormCollectionImpl::nextNamedItemInternal):
          (DOM::HTMLFormCollectionImpl::namedItem):
          (DOM::HTMLFormCollectionImpl::nextNamedItem):
          (DOM::HTMLFormCollectionImpl::updateNameCache):
          * khtml/html/html_miscimpl.h:
          * khtml/html/html_objectimpl.cpp:
          (DOM::HTMLAppletElementImpl::mapToEntry):
          (DOM::HTMLAppletElementImpl::parseMappedAttribute):
          (DOM::HTMLAppletElementImpl::rendererIsNeeded):
          (DOM::HTMLAppletElementImpl::createRenderer):
          (DOM::HTMLAppletElementImpl::align):
          (DOM::HTMLAppletElementImpl::setAlign):
          (DOM::HTMLAppletElementImpl::alt):
          (DOM::HTMLAppletElementImpl::setAlt):
          (DOM::HTMLAppletElementImpl::archive):
          (DOM::HTMLAppletElementImpl::setArchive):
          (DOM::HTMLAppletElementImpl::code):
          (DOM::HTMLAppletElementImpl::setCode):
          (DOM::HTMLAppletElementImpl::codeBase):
          (DOM::HTMLAppletElementImpl::setCodeBase):
          (DOM::HTMLAppletElementImpl::height):
          (DOM::HTMLAppletElementImpl::setHeight):
          (DOM::HTMLAppletElementImpl::hspace):
          (DOM::HTMLAppletElementImpl::setHspace):
          (DOM::HTMLAppletElementImpl::name):
          (DOM::HTMLAppletElementImpl::setName):
          (DOM::HTMLAppletElementImpl::object):
          (DOM::HTMLAppletElementImpl::setObject):
          (DOM::HTMLAppletElementImpl::vspace):
          (DOM::HTMLAppletElementImpl::setVspace):
          (DOM::HTMLAppletElementImpl::width):
          (DOM::HTMLAppletElementImpl::setWidth):
          (DOM::HTMLEmbedElementImpl::mapToEntry):
          (DOM::HTMLEmbedElementImpl::parseMappedAttribute):
          (DOM::HTMLEmbedElementImpl::isURLAttribute):
          (DOM::HTMLObjectElementImpl::mapToEntry):
          (DOM::HTMLObjectElementImpl::parseMappedAttribute):
          (DOM::HTMLObjectElementImpl::isURLAttribute):
          (DOM::HTMLObjectElementImpl::code):
          (DOM::HTMLObjectElementImpl::setCode):
          (DOM::HTMLObjectElementImpl::align):
          (DOM::HTMLObjectElementImpl::setAlign):
          (DOM::HTMLObjectElementImpl::archive):
          (DOM::HTMLObjectElementImpl::setArchive):
          (DOM::HTMLObjectElementImpl::border):
          (DOM::HTMLObjectElementImpl::setBorder):
          (DOM::HTMLObjectElementImpl::codeBase):
          (DOM::HTMLObjectElementImpl::setCodeBase):
          (DOM::HTMLObjectElementImpl::codeType):
          (DOM::HTMLObjectElementImpl::setCodeType):
          (DOM::HTMLObjectElementImpl::data):
          (DOM::HTMLObjectElementImpl::setData):
          (DOM::HTMLObjectElementImpl::declare):
          (DOM::HTMLObjectElementImpl::setDeclare):
          (DOM::HTMLObjectElementImpl::height):
          (DOM::HTMLObjectElementImpl::setHeight):
          (DOM::HTMLObjectElementImpl::hspace):
          (DOM::HTMLObjectElementImpl::setHspace):
          (DOM::HTMLObjectElementImpl::name):
          (DOM::HTMLObjectElementImpl::setName):
          (DOM::HTMLObjectElementImpl::standby):
          (DOM::HTMLObjectElementImpl::setStandby):
          (DOM::HTMLObjectElementImpl::tabIndex):
          (DOM::HTMLObjectElementImpl::setTabIndex):
          (DOM::HTMLObjectElementImpl::type):
          (DOM::HTMLObjectElementImpl::setType):
          (DOM::HTMLObjectElementImpl::useMap):
          (DOM::HTMLObjectElementImpl::setUseMap):
          (DOM::HTMLObjectElementImpl::vspace):
          (DOM::HTMLObjectElementImpl::setVspace):
          (DOM::HTMLObjectElementImpl::width):
          (DOM::HTMLObjectElementImpl::setWidth):
          (DOM::HTMLParamElementImpl::parseMappedAttribute):
          (DOM::HTMLParamElementImpl::isURLAttribute):
          (DOM::HTMLParamElementImpl::setName):
          (DOM::HTMLParamElementImpl::type):
          (DOM::HTMLParamElementImpl::setType):
          (DOM::HTMLParamElementImpl::setValue):
          (DOM::HTMLParamElementImpl::valueType):
          (DOM::HTMLParamElementImpl::setValueType):
          * khtml/html/html_objectimpl.h:
          * khtml/html/html_tableimpl.cpp:
          (DOM::HTMLTableElementImpl::mapToEntry):
          (DOM::HTMLTableElementImpl::parseMappedAttribute):
          (DOM::HTMLTableElementImpl::additionalAttributeStyleDecl):
          (DOM::HTMLTableElementImpl::getSharedCellDecl):
          (DOM::HTMLTableElementImpl::isURLAttribute):
          (DOM::HTMLTableElementImpl::align):
          (DOM::HTMLTableElementImpl::setAlign):
          (DOM::HTMLTableElementImpl::bgColor):
          (DOM::HTMLTableElementImpl::setBgColor):
          (DOM::HTMLTableElementImpl::border):
          (DOM::HTMLTableElementImpl::setBorder):
          (DOM::HTMLTableElementImpl::cellPadding):
          (DOM::HTMLTableElementImpl::setCellPadding):
          (DOM::HTMLTableElementImpl::cellSpacing):
          (DOM::HTMLTableElementImpl::setCellSpacing):
          (DOM::HTMLTableElementImpl::frame):
          (DOM::HTMLTableElementImpl::setFrame):
          (DOM::HTMLTableElementImpl::rules):
          (DOM::HTMLTableElementImpl::setRules):
          (DOM::HTMLTableElementImpl::summary):
          (DOM::HTMLTableElementImpl::setSummary):
          (DOM::HTMLTableElementImpl::width):
          (DOM::HTMLTableElementImpl::setWidth):
          (DOM::HTMLTablePartElementImpl::mapToEntry):
          (DOM::HTMLTablePartElementImpl::parseMappedAttribute):
          (DOM::HTMLTableSectionElementImpl::align):
          (DOM::HTMLTableSectionElementImpl::setAlign):
          (DOM::HTMLTableSectionElementImpl::ch):
          (DOM::HTMLTableSectionElementImpl::setCh):
          (DOM::HTMLTableSectionElementImpl::chOff):
          (DOM::HTMLTableSectionElementImpl::setChOff):
          (DOM::HTMLTableSectionElementImpl::vAlign):
          (DOM::HTMLTableSectionElementImpl::setVAlign):
          (DOM::HTMLTableRowElementImpl::align):
          (DOM::HTMLTableRowElementImpl::setAlign):
          (DOM::HTMLTableRowElementImpl::bgColor):
          (DOM::HTMLTableRowElementImpl::setBgColor):
          (DOM::HTMLTableRowElementImpl::ch):
          (DOM::HTMLTableRowElementImpl::setCh):
          (DOM::HTMLTableRowElementImpl::chOff):
          (DOM::HTMLTableRowElementImpl::setChOff):
          (DOM::HTMLTableRowElementImpl::vAlign):
          (DOM::HTMLTableRowElementImpl::setVAlign):
          (DOM::HTMLTableCellElementImpl::mapToEntry):
          (DOM::HTMLTableCellElementImpl::parseMappedAttribute):
          (DOM::HTMLTableCellElementImpl::isURLAttribute):
          (DOM::HTMLTableCellElementImpl::abbr):
          (DOM::HTMLTableCellElementImpl::setAbbr):
          (DOM::HTMLTableCellElementImpl::align):
          (DOM::HTMLTableCellElementImpl::setAlign):
          (DOM::HTMLTableCellElementImpl::axis):
          (DOM::HTMLTableCellElementImpl::setAxis):
          (DOM::HTMLTableCellElementImpl::bgColor):
          (DOM::HTMLTableCellElementImpl::setBgColor):
          (DOM::HTMLTableCellElementImpl::ch):
          (DOM::HTMLTableCellElementImpl::setCh):
          (DOM::HTMLTableCellElementImpl::chOff):
          (DOM::HTMLTableCellElementImpl::setChOff):
          (DOM::HTMLTableCellElementImpl::setColSpan):
          (DOM::HTMLTableCellElementImpl::headers):
          (DOM::HTMLTableCellElementImpl::setHeaders):
          (DOM::HTMLTableCellElementImpl::height):
          (DOM::HTMLTableCellElementImpl::setHeight):
          (DOM::HTMLTableCellElementImpl::noWrap):
          (DOM::HTMLTableCellElementImpl::setNoWrap):
          (DOM::HTMLTableCellElementImpl::setRowSpan):
          (DOM::HTMLTableCellElementImpl::scope):
          (DOM::HTMLTableCellElementImpl::setScope):
          (DOM::HTMLTableCellElementImpl::vAlign):
          (DOM::HTMLTableCellElementImpl::setVAlign):
          (DOM::HTMLTableCellElementImpl::width):
          (DOM::HTMLTableCellElementImpl::setWidth):
          (DOM::HTMLTableColElementImpl::mapToEntry):
          (DOM::HTMLTableColElementImpl::parseMappedAttribute):
          (DOM::HTMLTableColElementImpl::align):
          (DOM::HTMLTableColElementImpl::setAlign):
          (DOM::HTMLTableColElementImpl::ch):
          (DOM::HTMLTableColElementImpl::setCh):
          (DOM::HTMLTableColElementImpl::chOff):
          (DOM::HTMLTableColElementImpl::setChOff):
          (DOM::HTMLTableColElementImpl::setSpan):
          (DOM::HTMLTableColElementImpl::vAlign):
          (DOM::HTMLTableColElementImpl::setVAlign):
          (DOM::HTMLTableColElementImpl::width):
          (DOM::HTMLTableColElementImpl::setWidth):
          (DOM::HTMLTableCaptionElementImpl::mapToEntry):
          (DOM::HTMLTableCaptionElementImpl::parseMappedAttribute):
          (DOM::HTMLTableCaptionElementImpl::align):
          (DOM::HTMLTableCaptionElementImpl::setAlign):
          * khtml/html/html_tableimpl.h:
          * khtml/html/htmlnames.cpp:
          (DOM::HTMLNames::init):
          (DOM::HTMLAttributes::init):
          * khtml/html/htmlnames.h:
          * khtml/html/htmlparser.cpp:
          (HTMLParser::handleError):
          (HTMLParser::framesetCreateErrorCheck):
          (HTMLParser::handleIsindex):
          * khtml/html/htmltokenizer.cpp:
          (khtml::Token::addAttribute):
          (khtml::HTMLTokenizer::HTMLTokenizer):
          (khtml::HTMLTokenizer::parseTag):
          (khtml::HTMLTokenizer::processToken):
          * khtml/html/htmltokenizer.h:
          * khtml/khtml_part.cpp:
          (KHTMLPart::init):
          (KHTMLPart::backgroundURL):
          (KHTMLPart::updateActions):
          (KHTMLPart::handleMouseMoveEventDrag):
          (KHTMLPart::selectionComputedStyle):
          (KHTMLPart::applyEditingStyleToElement):
          (KHTMLPart::removeEditingStyleFromElement):
          * khtml/khtmlview.cpp:
          * khtml/misc/decoder.cpp:
          * khtml/misc/htmlattrs.in: Removed.
          * khtml/misc/htmlhashes.cpp: Removed.
          * khtml/misc/htmlhashes.h: Removed.
          * khtml/misc/htmltags.in: Removed.
          * khtml/misc/makeattrs: Removed.
          * khtml/misc/maketags: Removed.
          * khtml/rendering/render_box.cpp:
          * khtml/rendering/render_form.cpp:
          (RenderLineEdit::updateFromElement):
          (RenderSelect::updateFromElement):
          (RenderSlider::updateFromElement):
          (RenderSlider::slotSliderValueChanged):
          * khtml/rendering/render_frames.cpp:
          (RenderPartObject::updateWidget):
          * khtml/rendering/render_object.cpp:
          * khtml/rendering/render_table.cpp:
          (RenderTableCell::calcMinMaxWidth):
          * khtml/xml/dom_docimpl.cpp:
          (DocumentImpl::createElement):
          (DocumentImpl::importNode):
          (DocumentImpl::createElementNS):
          (DocumentImpl::getElementById):
          (DocumentImpl::getElementByAccessKey):
          (DocumentImpl::prepareMouseEvent):
          (DocumentImpl::recalcStyleSelector):
          (DocumentImpl::createAttributeNS):
          * khtml/xml/dom_docimpl.h:
          * khtml/xml/dom_elementimpl.cpp:
          (AttributeImpl::clone):
          (AttributeImpl::allocateImpl):
          (AttrImpl::AttrImpl):
          (AttrImpl::~AttrImpl):
          (AttrImpl::nodeName):
          (AttrImpl::name):
          (ElementImpl::removeAttribute):
          (ElementImpl::setAttribute):
          (ElementImpl::getAttribute):
          (ElementImpl::getAttributeNS):
          (ElementImpl::createAttribute):
          (ElementImpl::setAttributeMap):
          (ElementImpl::nodeName):
          (ElementImpl::insertedIntoDocument):
          (ElementImpl::removedFromDocument):
          (ElementImpl::openTagStartToString):
          (ElementImpl::dump):
          (ElementImpl::formatForDebugger):
          (ElementImpl::removeAttributeNode):
          (ElementImpl::setAttributeNS):
          (ElementImpl::removeAttributeNS):
          (ElementImpl::getAttributeNodeNS):
          (ElementImpl::hasAttributeNS):
          (NamedAttrMapImpl::getNamedItem):
          (NamedAttrMapImpl::setNamedItem):
          (NamedAttrMapImpl::removeNamedItem):
          (NamedAttrMapImpl::getAttributeItem):
          (NamedAttrMapImpl::clearAttributes):
          (NamedAttrMapImpl::operator=):
          (NamedAttrMapImpl::addAttribute):
          (NamedAttrMapImpl::removeAttribute):
          (StyledElementImpl::getMappedAttributeDecl):
          (StyledElementImpl::setMappedAttributeDecl):
          (StyledElementImpl::removeMappedAttributeDecl):
          (StyledElementImpl::updateStyleAttributeIfNeeded):
          (MappedAttributeImpl::clone):
          (NamedMappedAttrMapImpl::mapsEquivalent):
          (StyledElementImpl::createAttribute):
          (StyledElementImpl::attributeChanged):
          (StyledElementImpl::mapToEntry):
          (StyledElementImpl::parseMappedAttribute):
          * khtml/xml/dom_elementimpl.h:
          (DOM::AttributeImpl::AttributeImpl):
          (DOM::AttributeImpl::value):
          (DOM::AttributeImpl::prefix):
          (DOM::AttributeImpl::localName):
          (DOM::AttributeImpl::namespaceURI):
          (DOM::AttributeImpl::name):
          (DOM::AttributeImpl::attrImpl):
          (DOM::AttributeImpl::isNull):
          (DOM::AttributeImpl::isEmpty):
          (DOM::AttributeImpl::setValue):
          (DOM::AttributeImpl::setPrefix):
          (DOM::NamedAttrMapImpl::insertAttribute):
          (DOM::CSSMappedAttributeDeclarationImpl::CSSMappedAttributeDeclarationImpl):
          (DOM::CSSMappedAttributeDeclarationImpl::setMappedState):
          (DOM::MappedAttributeImpl::MappedAttributeImpl):
          (DOM::StyledElementImpl::isMappedAttribute):
          * khtml/xml/dom_nodeimpl.cpp:
          (DOM::NodeImpl::namespaceURI):
          (DOM::appendAttributeDesc):
          (DOM::NodeImpl::showNode):
          (DOM::NameNodeListImpl::nodeMatches):
          (DOM::NamedNodeMapImpl::getNamedItemNS):
          (DOM::NamedNodeMapImpl::removeNamedItemNS):
          * khtml/xml/dom_nodeimpl.h:
          * khtml/xml/dom_qname.cpp:
          (DOM::QualifiedName::toString):
          (DOM::QualifiedName::init):
          * khtml/xml/dom_qname.h:
          (DOM::anyQName):
          * khtml/xml/dom_textimpl.cpp:
          * khtml/xml/xml_tokenizer.cpp:
          (khtml::XMLTokenizer::startElement):
          (khtml::XMLTokenizer::insertErrorMessageBlock):
          (khtml::XMLTokenizer::executeScripts):
          * kwq/DOMHTML.h:
          * kwq/DOMHTML.mm:
          (-[DOMHTMLElement idName]):
          (-[DOMHTMLElement setIdName:]):
          (-[DOMHTMLElement title]):
          (-[DOMHTMLElement setTitle:]):
          (-[DOMHTMLElement lang]):
          (-[DOMHTMLElement setLang:]):
          (-[DOMHTMLElement dir]):
          (-[DOMHTMLElement setDir:]):
          (-[DOMHTMLElement className]):
          (-[DOMHTMLElement setClassName:]):
          (-[DOMHTMLHtmlElement version]):
          (-[DOMHTMLHtmlElement setVersion:]):
          (-[DOMHTMLHeadElement profile]):
          (-[DOMHTMLHeadElement setProfile:]):
          (-[DOMHTMLLinkElement disabled]):
          (-[DOMHTMLLinkElement setDisabled:]):
          (-[DOMHTMLLinkElement charset]):
          (-[DOMHTMLLinkElement setCharset:]):
          (-[DOMHTMLLinkElement setHref:]):
          (-[DOMHTMLLinkElement hreflang]):
          (-[DOMHTMLLinkElement setHreflang:]):
          (-[DOMHTMLLinkElement media]):
          (-[DOMHTMLLinkElement setMedia:]):
          (-[DOMHTMLLinkElement rel]):
          (-[DOMHTMLLinkElement setRel:]):
          (-[DOMHTMLLinkElement rev]):
          (-[DOMHTMLLinkElement setRev:]):
          (-[DOMHTMLLinkElement target]):
          (-[DOMHTMLLinkElement setTarget:]):
          (-[DOMHTMLLinkElement type]):
          (-[DOMHTMLLinkElement setType:]):
          (-[DOMHTMLTitleElement text]):
          (-[DOMHTMLTitleElement setText:]):
          (-[DOMHTMLMetaElement content]):
          (-[DOMHTMLMetaElement setContent:]):
          (-[DOMHTMLMetaElement httpEquiv]):
          (-[DOMHTMLMetaElement setHttpEquiv:]):
          (-[DOMHTMLMetaElement name]):
          (-[DOMHTMLMetaElement setName:]):
          (-[DOMHTMLMetaElement scheme]):
          (-[DOMHTMLMetaElement setScheme:]):
          (-[DOMHTMLBaseElement setHref:]):
          (-[DOMHTMLBaseElement target]):
          (-[DOMHTMLBaseElement setTarget:]):
          (-[DOMHTMLStyleElement disabled]):
          (-[DOMHTMLStyleElement setDisabled:]):
          (-[DOMHTMLStyleElement media]):
          (-[DOMHTMLStyleElement setMedia:]):
          (-[DOMHTMLStyleElement type]):
          (-[DOMHTMLStyleElement setType:]):
          (-[DOMHTMLBodyElement aLink]):
          (-[DOMHTMLBodyElement setALink:]):
          (-[DOMHTMLBodyElement background]):
          (-[DOMHTMLBodyElement setBackground:]):
          (-[DOMHTMLBodyElement bgColor]):
          (-[DOMHTMLBodyElement setBgColor:]):
          (-[DOMHTMLBodyElement link]):
          (-[DOMHTMLBodyElement setLink:]):
          (-[DOMHTMLBodyElement text]):
          (-[DOMHTMLBodyElement setText:]):
          (-[DOMHTMLBodyElement vLink]):
          (-[DOMHTMLBodyElement setVLink:]):
          (-[DOMHTMLFormElement name]):
          (-[DOMHTMLFormElement setName:]):
          (-[DOMHTMLFormElement acceptCharset]):
          (-[DOMHTMLFormElement setAcceptCharset:]):
          (-[DOMHTMLFormElement action]):
          (-[DOMHTMLFormElement setAction:]):
          (-[DOMHTMLFormElement enctype]):
          (-[DOMHTMLFormElement setEnctype:]):
          (-[DOMHTMLFormElement method]):
          (-[DOMHTMLFormElement setMethod:]):
          (-[DOMHTMLFormElement target]):
          (-[DOMHTMLFormElement setTarget:]):
          (-[DOMHTMLIsIndexElement prompt]):
          (-[DOMHTMLIsIndexElement setPrompt:]):
          (-[DOMHTMLSelectElement disabled]):
          (-[DOMHTMLSelectElement setDisabled:]):
          (-[DOMHTMLSelectElement multiple]):
          (-[DOMHTMLSelectElement setMultiple:]):
          (-[DOMHTMLSelectElement size]):
          (-[DOMHTMLSelectElement setSize:]):
          (-[DOMHTMLOptGroupElement disabled]):
          (-[DOMHTMLOptGroupElement setDisabled:]):
          (-[DOMHTMLOptGroupElement label]):
          (-[DOMHTMLOptGroupElement setLabel:]):
          (-[DOMHTMLOptionElement defaultSelected]):
          (-[DOMHTMLOptionElement setDefaultSelected:]):
          (-[DOMHTMLOptionElement disabled]):
          (-[DOMHTMLOptionElement setDisabled:]):
          (-[DOMHTMLOptionElement label]):
          (-[DOMHTMLOptionElement setLabel:]):
          (-[DOMHTMLInputElement defaultValue]):
          (-[DOMHTMLInputElement setDefaultValue:]):
          (-[DOMHTMLInputElement defaultChecked]):
          (-[DOMHTMLInputElement setDefaultChecked:]):
          (-[DOMHTMLInputElement accept]):
          (-[DOMHTMLInputElement setAccept:]):
          (-[DOMHTMLInputElement accessKey]):
          (-[DOMHTMLInputElement setAccessKey:]):
          (-[DOMHTMLInputElement align]):
          (-[DOMHTMLInputElement setAlign:]):
          (-[DOMHTMLInputElement alt]):
          (-[DOMHTMLInputElement setAlt:]):
          (-[DOMHTMLInputElement disabled]):
          (-[DOMHTMLInputElement setDisabled:]):
          (-[DOMHTMLInputElement maxLength]):
          (-[DOMHTMLInputElement setMaxLength:]):
          (-[DOMHTMLInputElement readOnly]):
          (-[DOMHTMLInputElement setReadOnly:]):
          (-[DOMHTMLInputElement size]):
          (-[DOMHTMLInputElement setSize:]):
          (-[DOMHTMLInputElement setSrc:]):
          (-[DOMHTMLInputElement useMap]):
          (-[DOMHTMLInputElement setUseMap:]):
          (-[DOMHTMLTextAreaElement accessKey]):
          (-[DOMHTMLTextAreaElement setAccessKey:]):
          (-[DOMHTMLTextAreaElement cols]):
          (-[DOMHTMLTextAreaElement setCols:]):
          (-[DOMHTMLTextAreaElement disabled]):
          (-[DOMHTMLTextAreaElement setDisabled:]):
          (-[DOMHTMLTextAreaElement readOnly]):
          (-[DOMHTMLTextAreaElement setReadOnly:]):
          (-[DOMHTMLTextAreaElement rows]):
          (-[DOMHTMLTextAreaElement setRows:]):
          (-[DOMHTMLButtonElement accessKey]):
          (-[DOMHTMLButtonElement setAccessKey:]):
          (-[DOMHTMLButtonElement disabled]):
          (-[DOMHTMLButtonElement setDisabled:]):
          (-[DOMHTMLButtonElement value]):
          (-[DOMHTMLButtonElement setValue:]):
          (-[DOMHTMLLabelElement accessKey]):
          (-[DOMHTMLLabelElement setAccessKey:]):
          (-[DOMHTMLLabelElement htmlFor]):
          (-[DOMHTMLLabelElement setHtmlFor:]):
          (-[DOMHTMLLegendElement accessKey]):
          (-[DOMHTMLLegendElement setAccessKey:]):
          (-[DOMHTMLLegendElement align]):
          (-[DOMHTMLLegendElement setAlign:]):
          (-[DOMHTMLUListElement compact]):
          (-[DOMHTMLUListElement setCompact:]):
          (-[DOMHTMLUListElement type]):
          (-[DOMHTMLUListElement setType:]):
          (-[DOMHTMLOListElement compact]):
          (-[DOMHTMLOListElement setCompact:]):
          (-[DOMHTMLOListElement start]):
          (-[DOMHTMLOListElement setStart:]):
          (-[DOMHTMLOListElement type]):
          (-[DOMHTMLOListElement setType:]):
          (-[DOMHTMLDListElement compact]):
          (-[DOMHTMLDListElement setCompact:]):
          (-[DOMHTMLDirectoryElement compact]):
          (-[DOMHTMLDirectoryElement setCompact:]):
          (-[DOMHTMLMenuElement compact]):
          (-[DOMHTMLMenuElement setCompact:]):
          (-[DOMHTMLLIElement type]):
          (-[DOMHTMLLIElement setType:]):
          (-[DOMHTMLLIElement value]):
          (-[DOMHTMLLIElement setValue:]):
          (-[DOMHTMLQuoteElement cite]):
          (-[DOMHTMLQuoteElement setCite:]):
          (-[DOMHTMLDivElement align]):
          (-[DOMHTMLDivElement setAlign:]):
          (-[DOMHTMLParagraphElement align]):
          (-[DOMHTMLParagraphElement setAlign:]):
          (-[DOMHTMLHeadingElement align]):
          (-[DOMHTMLHeadingElement setAlign:]):
          (-[DOMHTMLPreElement width]):
          (-[DOMHTMLPreElement setWidth:]):
          (-[DOMHTMLBRElement clear]):
          (-[DOMHTMLBRElement setClear:]):
          (-[DOMHTMLBaseFontElement color]):
          (-[DOMHTMLBaseFontElement setColor:]):
          (-[DOMHTMLBaseFontElement face]):
          (-[DOMHTMLBaseFontElement setFace:]):
          (-[DOMHTMLBaseFontElement size]):
          (-[DOMHTMLBaseFontElement setSize:]):
          (-[DOMHTMLFontElement color]):
          (-[DOMHTMLFontElement setColor:]):
          (-[DOMHTMLFontElement face]):
          (-[DOMHTMLFontElement setFace:]):
          (-[DOMHTMLFontElement size]):
          (-[DOMHTMLFontElement setSize:]):
          (-[DOMHTMLHRElement align]):
          (-[DOMHTMLHRElement setAlign:]):
          (-[DOMHTMLHRElement noShade]):
          (-[DOMHTMLHRElement setNoShade:]):
          (-[DOMHTMLHRElement size]):
          (-[DOMHTMLHRElement setSize:]):
          (-[DOMHTMLHRElement width]):
          (-[DOMHTMLHRElement setWidth:]):
          (-[DOMHTMLModElement cite]):
          (-[DOMHTMLModElement setCite:]):
          (-[DOMHTMLModElement dateTime]):
          (-[DOMHTMLModElement setDateTime:]):
          (-[DOMHTMLAnchorElement accessKey]):
          (-[DOMHTMLAnchorElement setAccessKey:]):
          (-[DOMHTMLAnchorElement charset]):
          (-[DOMHTMLAnchorElement setCharset:]):
          (-[DOMHTMLAnchorElement coords]):
          (-[DOMHTMLAnchorElement setCoords:]):
          (-[DOMHTMLAnchorElement setHref:]):
          (-[DOMHTMLAnchorElement hreflang]):
          (-[DOMHTMLAnchorElement setHreflang:]):
          (-[DOMHTMLAnchorElement name]):
          (-[DOMHTMLAnchorElement setName:]):
          (-[DOMHTMLAnchorElement rel]):
          (-[DOMHTMLAnchorElement setRel:]):
          (-[DOMHTMLAnchorElement rev]):
          (-[DOMHTMLAnchorElement setRev:]):
          (-[DOMHTMLAnchorElement shape]):
          (-[DOMHTMLAnchorElement setShape:]):
          (-[DOMHTMLAnchorElement tabIndex]):
          (-[DOMHTMLAnchorElement setTabIndex:]):
          (-[DOMHTMLAnchorElement target]):
          (-[DOMHTMLAnchorElement setTarget:]):
          (-[DOMHTMLAnchorElement type]):
          (-[DOMHTMLAnchorElement setType:]):
          (-[DOMHTMLImageElement name]):
          (-[DOMHTMLImageElement setName:]):
          (-[DOMHTMLImageElement align]):
          (-[DOMHTMLImageElement setAlign:]):
          (-[DOMHTMLImageElement alt]):
          (-[DOMHTMLImageElement setAlt:]):
          (-[DOMHTMLImageElement border]):
          (-[DOMHTMLImageElement setBorder:]):
          (-[DOMHTMLImageElement height]):
          (-[DOMHTMLImageElement setHeight:]):
          (-[DOMHTMLImageElement hspace]):
          (-[DOMHTMLImageElement setHspace:]):
          (-[DOMHTMLImageElement isMap]):
          (-[DOMHTMLImageElement setIsMap:]):
          (-[DOMHTMLImageElement longDesc]):
          (-[DOMHTMLImageElement setLongDesc:]):
          (-[DOMHTMLImageElement setSrc:]):
          (-[DOMHTMLImageElement useMap]):
          (-[DOMHTMLImageElement setUseMap:]):
          (-[DOMHTMLImageElement vspace]):
          (-[DOMHTMLImageElement setVspace:]):
          (-[DOMHTMLImageElement width]):
          (-[DOMHTMLImageElement setWidth:]):
          (-[DOMHTMLObjectElement code]):
          (-[DOMHTMLObjectElement setCode:]):
          (-[DOMHTMLObjectElement align]):
          (-[DOMHTMLObjectElement setAlign:]):
          (-[DOMHTMLObjectElement archive]):
          (-[DOMHTMLObjectElement setArchive:]):
          (-[DOMHTMLObjectElement border]):
          (-[DOMHTMLObjectElement setBorder:]):
          (-[DOMHTMLObjectElement codeBase]):
          (-[DOMHTMLObjectElement setCodeBase:]):
          (-[DOMHTMLObjectElement codeType]):
          (-[DOMHTMLObjectElement setCodeType:]):
          (-[DOMHTMLObjectElement data]):
          (-[DOMHTMLObjectElement setData:]):
          (-[DOMHTMLObjectElement declare]):
          (-[DOMHTMLObjectElement setDeclare:]):
          (-[DOMHTMLObjectElement height]):
          (-[DOMHTMLObjectElement setHeight:]):
          (-[DOMHTMLObjectElement hspace]):
          (-[DOMHTMLObjectElement setHspace:]):
          (-[DOMHTMLObjectElement name]):
          (-[DOMHTMLObjectElement setName:]):
          (-[DOMHTMLObjectElement standby]):
          (-[DOMHTMLObjectElement setStandby:]):
          (-[DOMHTMLObjectElement tabIndex]):
          (-[DOMHTMLObjectElement setTabIndex:]):
          (-[DOMHTMLObjectElement type]):
          (-[DOMHTMLObjectElement setType:]):
          (-[DOMHTMLObjectElement useMap]):
          (-[DOMHTMLObjectElement setUseMap:]):
          (-[DOMHTMLObjectElement vspace]):
          (-[DOMHTMLObjectElement setVspace:]):
          (-[DOMHTMLObjectElement width]):
          (-[DOMHTMLObjectElement setWidth:]):
          (-[DOMHTMLParamElement name]):
          (-[DOMHTMLParamElement setName:]):
          (-[DOMHTMLParamElement type]):
          (-[DOMHTMLParamElement setType:]):
          (-[DOMHTMLParamElement value]):
          (-[DOMHTMLParamElement setValue:]):
          (-[DOMHTMLParamElement valueType]):
          (-[DOMHTMLParamElement setValueType:]):
          (-[DOMHTMLAppletElement align]):
          (-[DOMHTMLAppletElement setAlign:]):
          (-[DOMHTMLAppletElement alt]):
          (-[DOMHTMLAppletElement setAlt:]):
          (-[DOMHTMLAppletElement archive]):
          (-[DOMHTMLAppletElement setArchive:]):
          (-[DOMHTMLAppletElement code]):
          (-[DOMHTMLAppletElement setCode:]):
          (-[DOMHTMLAppletElement codeBase]):
          (-[DOMHTMLAppletElement setCodeBase:]):
          (-[DOMHTMLAppletElement height]):
          (-[DOMHTMLAppletElement setHeight:]):
          (-[DOMHTMLAppletElement hspace]):
          (-[DOMHTMLAppletElement setHspace:]):
          (-[DOMHTMLAppletElement name]):
          (-[DOMHTMLAppletElement setName:]):
          (-[DOMHTMLAppletElement object]):
          (-[DOMHTMLAppletElement setObject:]):
          (-[DOMHTMLAppletElement vspace]):
          (-[DOMHTMLAppletElement setVspace:]):
          (-[DOMHTMLAppletElement width]):
          (-[DOMHTMLAppletElement setWidth:]):
          (-[DOMHTMLMapElement name]):
          (-[DOMHTMLMapElement setName:]):
          (-[DOMHTMLAreaElement accessKey]):
          (-[DOMHTMLAreaElement setAccessKey:]):
          (-[DOMHTMLAreaElement alt]):
          (-[DOMHTMLAreaElement setAlt:]):
          (-[DOMHTMLAreaElement coords]):
          (-[DOMHTMLAreaElement setCoords:]):
          (-[DOMHTMLAreaElement setHref:]):
          (-[DOMHTMLAreaElement noHref]):
          (-[DOMHTMLAreaElement setNoHref:]):
          (-[DOMHTMLAreaElement shape]):
          (-[DOMHTMLAreaElement setShape:]):
          (-[DOMHTMLAreaElement tabIndex]):
          (-[DOMHTMLAreaElement setTabIndex:]):
          (-[DOMHTMLAreaElement target]):
          (-[DOMHTMLAreaElement setTarget:]):
          (-[DOMHTMLScriptElement text]):
          (-[DOMHTMLScriptElement setText:]):
          (-[DOMHTMLScriptElement charset]):
          (-[DOMHTMLScriptElement setCharset:]):
          (-[DOMHTMLScriptElement defer]):
          (-[DOMHTMLScriptElement setDefer:]):
          (-[DOMHTMLScriptElement src]):
          (-[DOMHTMLScriptElement setSrc:]):
          (-[DOMHTMLScriptElement type]):
          (-[DOMHTMLScriptElement setType:]):
          (-[DOMHTMLTableCaptionElement align]):
          (-[DOMHTMLTableCaptionElement setAlign:]):
          (-[DOMHTMLTableSectionElement align]):
          (-[DOMHTMLTableSectionElement setAlign:]):
          (-[DOMHTMLTableSectionElement ch]):
          (-[DOMHTMLTableSectionElement setCh:]):
          (-[DOMHTMLTableSectionElement chOff]):
          (-[DOMHTMLTableSectionElement setChOff:]):
          (-[DOMHTMLTableSectionElement vAlign]):
          (-[DOMHTMLTableSectionElement setVAlign:]):
          (-[DOMHTMLTableElement align]):
          (-[DOMHTMLTableElement setAlign:]):
          (-[DOMHTMLTableElement bgColor]):
          (-[DOMHTMLTableElement setBgColor:]):
          (-[DOMHTMLTableElement border]):
          (-[DOMHTMLTableElement setBorder:]):
          (-[DOMHTMLTableElement cellPadding]):
          (-[DOMHTMLTableElement setCellPadding:]):
          (-[DOMHTMLTableElement cellSpacing]):
          (-[DOMHTMLTableElement setCellSpacing:]):
          (-[DOMHTMLTableElement frameBorders]):
          (-[DOMHTMLTableElement setFrameBorders:]):
          (-[DOMHTMLTableElement rules]):
          (-[DOMHTMLTableElement setRules:]):
          (-[DOMHTMLTableElement summary]):
          (-[DOMHTMLTableElement setSummary:]):
          (-[DOMHTMLTableElement width]):
          (-[DOMHTMLTableElement setWidth:]):
          (-[DOMHTMLTableColElement align]):
          (-[DOMHTMLTableColElement setAlign:]):
          (-[DOMHTMLTableColElement ch]):
          (-[DOMHTMLTableColElement setCh:]):
          (-[DOMHTMLTableColElement chOff]):
          (-[DOMHTMLTableColElement setChOff:]):
          (-[DOMHTMLTableColElement span]):
          (-[DOMHTMLTableColElement setSpan:]):
          (-[DOMHTMLTableColElement vAlign]):
          (-[DOMHTMLTableColElement setVAlign:]):
          (-[DOMHTMLTableColElement width]):
          (-[DOMHTMLTableColElement setWidth:]):
          (-[DOMHTMLTableRowElement align]):
          (-[DOMHTMLTableRowElement setAlign:]):
          (-[DOMHTMLTableRowElement bgColor]):
          (-[DOMHTMLTableRowElement setBgColor:]):
          (-[DOMHTMLTableRowElement ch]):
          (-[DOMHTMLTableRowElement setCh:]):
          (-[DOMHTMLTableRowElement chOff]):
          (-[DOMHTMLTableRowElement setChOff:]):
          (-[DOMHTMLTableRowElement vAlign]):
          (-[DOMHTMLTableRowElement setVAlign:]):
          (-[DOMHTMLTableCellElement abbr]):
          (-[DOMHTMLTableCellElement setAbbr:]):
          (-[DOMHTMLTableCellElement align]):
          (-[DOMHTMLTableCellElement setAlign:]):
          (-[DOMHTMLTableCellElement axis]):
          (-[DOMHTMLTableCellElement setAxis:]):
          (-[DOMHTMLTableCellElement bgColor]):
          (-[DOMHTMLTableCellElement setBgColor:]):
          (-[DOMHTMLTableCellElement ch]):
          (-[DOMHTMLTableCellElement setCh:]):
          (-[DOMHTMLTableCellElement chOff]):
          (-[DOMHTMLTableCellElement setChOff:]):
          (-[DOMHTMLTableCellElement colSpan]):
          (-[DOMHTMLTableCellElement setColSpan:]):
          (-[DOMHTMLTableCellElement headers]):
          (-[DOMHTMLTableCellElement setHeaders:]):
          (-[DOMHTMLTableCellElement height]):
          (-[DOMHTMLTableCellElement setHeight:]):
          (-[DOMHTMLTableCellElement noWrap]):
          (-[DOMHTMLTableCellElement setNoWrap:]):
          (-[DOMHTMLTableCellElement rowSpan]):
          (-[DOMHTMLTableCellElement setRowSpan:]):
          (-[DOMHTMLTableCellElement scope]):
          (-[DOMHTMLTableCellElement setScope:]):
          (-[DOMHTMLTableCellElement vAlign]):
          (-[DOMHTMLTableCellElement setVAlign:]):
          (-[DOMHTMLTableCellElement width]):
          (-[DOMHTMLTableCellElement setWidth:]):
          (-[DOMHTMLFrameSetElement rows]):
          (-[DOMHTMLFrameSetElement setRows:]):
          (-[DOMHTMLFrameSetElement cols]):
          (-[DOMHTMLFrameSetElement setCols:]):
          (-[DOMHTMLFrameElement frameBorder]):
          (-[DOMHTMLFrameElement setFrameBorder:]):
          (-[DOMHTMLFrameElement longDesc]):
          (-[DOMHTMLFrameElement setLongDesc:]):
          (-[DOMHTMLFrameElement marginHeight]):
          (-[DOMHTMLFrameElement setMarginHeight:]):
          (-[DOMHTMLFrameElement marginWidth]):
          (-[DOMHTMLFrameElement setMarginWidth:]):
          (-[DOMHTMLFrameElement name]):
          (-[DOMHTMLFrameElement setName:]):
          (-[DOMHTMLFrameElement noResize]):
          (-[DOMHTMLFrameElement setNoResize:]):
          (-[DOMHTMLFrameElement scrolling]):
          (-[DOMHTMLFrameElement setScrolling:]):
          (-[DOMHTMLFrameElement src]):
          (-[DOMHTMLFrameElement setSrc:]):
          (-[DOMHTMLIFrameElement align]):
          (-[DOMHTMLIFrameElement setAlign:]):
          (-[DOMHTMLIFrameElement frameBorder]):
          (-[DOMHTMLIFrameElement setFrameBorder:]):
          (-[DOMHTMLIFrameElement height]):
          (-[DOMHTMLIFrameElement setHeight:]):
          (-[DOMHTMLIFrameElement longDesc]):
          (-[DOMHTMLIFrameElement setLongDesc:]):
          (-[DOMHTMLIFrameElement marginHeight]):
          (-[DOMHTMLIFrameElement setMarginHeight:]):
          (-[DOMHTMLIFrameElement marginWidth]):
          (-[DOMHTMLIFrameElement setMarginWidth:]):
          (-[DOMHTMLIFrameElement name]):
          (-[DOMHTMLIFrameElement setName:]):
          (-[DOMHTMLIFrameElement noResize]):
          (-[DOMHTMLIFrameElement setNoResize:]):
          (-[DOMHTMLIFrameElement scrolling]):
          (-[DOMHTMLIFrameElement setScrolling:]):
          (-[DOMHTMLIFrameElement src]):
          (-[DOMHTMLIFrameElement setSrc:]):
          (-[DOMHTMLIFrameElement width]):
          (-[DOMHTMLIFrameElement setWidth:]):
          (-[DOMHTMLEmbedElement align]):
          (-[DOMHTMLEmbedElement setAlign:]):
          (-[DOMHTMLEmbedElement height]):
          (-[DOMHTMLEmbedElement setHeight:]):
          (-[DOMHTMLEmbedElement name]):
          (-[DOMHTMLEmbedElement setName:]):
          (-[DOMHTMLEmbedElement src]):
          (-[DOMHTMLEmbedElement setSrc:]):
          (-[DOMHTMLEmbedElement type]):
          (-[DOMHTMLEmbedElement setType:]):
          (-[DOMHTMLEmbedElement width]):
          (-[DOMHTMLEmbedElement setWidth:]):
          * kwq/KWQAccObject.mm:
          (-[KWQAccObject helpText]):
          (-[KWQAccObject accessibilityDescription]):
          (-[KWQAccObject accessibilityAttributeValue:]):
          * kwq/KWQKHTMLPart.mm:
          (KWQKHTMLPart::matchLabelsAgainstElement):
          (KWQKHTMLPart::fileWrapperForElement):
          (KWQKHTMLPart::attributedString):
          (KWQKHTMLPart::styleForSelectionStart):
          * kwq/WebCoreBridge.mm:
          (-[WebCoreBridge elementAtPoint:]):
  
  Revision  Changes    Path
  1.4435    +1230 -0   WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4434
  retrieving revision 1.4435
  diff -u -r1.4434 -r1.4435
  --- ChangeLog	18 Jul 2005 18:14:56 -0000	1.4434
  +++ ChangeLog	18 Jul 2005 21:44:07 -0000	1.4435
  @@ -1,3 +1,1233 @@
  +2005-07-18  David Hyatt  <hyatt at apple.com>
  +
  +	Fix for bugzilla bug 3927.  Convert attributes to use QualifiedName.
  +	
  +        Reviewed by mjs
  +
  +        * WebCore.pbproj/project.pbxproj:
  +        * khtml/css/css_base.cpp:
  +        (CSSSelector::print):
  +        (CSSSelector::selectorText):
  +        * khtml/css/css_base.h:
  +        (DOM::CSSSelector::CSSSelector):
  +        (DOM::CSSSelector::hasTag):
  +        (DOM::CSSSelector::hasAttribute):
  +        * khtml/css/css_stylesheetimpl.cpp:
  +        (CSSStyleSheetImpl::determineNamespace):
  +        * khtml/css/cssparser.cpp:
  +        (CSSParser::parseContent):
  +        * khtml/css/cssstyleselector.cpp:
  +        (khtml::checkPseudoState):
  +        (khtml::CSSStyleSelector::canShareStyleWithElement):
  +        (khtml::CSSStyleSelector::checkOneSelector):
  +        (khtml::CSSStyleSelector::applyProperty):
  +        * khtml/css/parser.y:
  +        * khtml/dom/css_stylesheet.cpp:
  +        * khtml/dom/html_base.cpp:
  +        * khtml/dom/html_block.cpp:
  +        * khtml/dom/html_document.cpp:
  +        * khtml/dom/html_element.cpp:
  +        * khtml/dom/html_form.cpp:
  +        * khtml/dom/html_head.cpp:
  +        * khtml/dom/html_image.cpp:
  +        * khtml/dom/html_inline.cpp:
  +        * khtml/dom/html_list.cpp:
  +        * khtml/dom/html_misc.cpp:
  +        * khtml/dom/html_object.cpp:
  +        * khtml/dom/html_table.cpp:
  +        * khtml/ecma/kjs_html.cpp:
  +        (KJS::HTMLElement::inputGetter):
  +        (KJS::HTMLElement::inputSetter):
  +        * khtml/editing/apply_style_command.cpp:
  +        (khtml::isStyleSpan):
  +        (khtml::isEmptyStyleSpan):
  +        (khtml::isEmptyFontTag):
  +        (khtml::createFontElement):
  +        (khtml::createStyleSpanElement):
  +        (khtml::ApplyStyleCommand::applyRelativeFontStyleChange):
  +        (khtml::ApplyStyleCommand::removeHTMLFontStyle):
  +        (khtml::ApplyStyleCommand::applyTextDecorationStyle):
  +        (khtml::areIdenticalElements):
  +        (khtml::ApplyStyleCommand::addBlockStyleIfNeeded):
  +        (khtml::ApplyStyleCommand::addInlineStyleIfNeeded):
  +        * khtml/editing/composite_edit_command.cpp:
  +        (khtml::CompositeEditCommand::removeNodeAttribute):
  +        (khtml::CompositeEditCommand::setNodeAttribute):
  +        (khtml::CompositeEditCommand::findBlockPlaceholder):
  +        (khtml::createBlockPlaceholderElement):
  +        * khtml/editing/composite_edit_command.h:
  +        * khtml/editing/markup.cpp:
  +        (khtml::startMarkup):
  +        (khtml::completeURLs):
  +        (khtml::createFragmentFromText):
  +        * khtml/editing/remove_node_attribute_command.cpp:
  +        (khtml::RemoveNodeAttributeCommand::RemoveNodeAttributeCommand):
  +        * khtml/editing/remove_node_attribute_command.h:
  +        (khtml::RemoveNodeAttributeCommand::attribute):
  +        * khtml/editing/replace_selection_command.cpp:
  +        (khtml::ReplacementFragment::isInterchangeNewlineNode):
  +        (khtml::ReplacementFragment::isInterchangeConvertedSpaceSpan):
  +        * khtml/editing/set_node_attribute_command.cpp:
  +        (khtml::SetNodeAttributeCommand::SetNodeAttributeCommand):
  +        * khtml/editing/set_node_attribute_command.h:
  +        (khtml::SetNodeAttributeCommand::attribute):
  +        * khtml/html/html_baseimpl.cpp:
  +        (HTMLBodyElementImpl::mapToEntry):
  +        (HTMLBodyElementImpl::parseMappedAttribute):
  +        (HTMLBodyElementImpl::insertedIntoDocument):
  +        (HTMLBodyElementImpl::isURLAttribute):
  +        (HTMLBodyElementImpl::aLink):
  +        (HTMLBodyElementImpl::setALink):
  +        (HTMLBodyElementImpl::background):
  +        (HTMLBodyElementImpl::setBackground):
  +        (HTMLBodyElementImpl::bgColor):
  +        (HTMLBodyElementImpl::setBgColor):
  +        (HTMLBodyElementImpl::link):
  +        (HTMLBodyElementImpl::setLink):
  +        (HTMLBodyElementImpl::text):
  +        (HTMLBodyElementImpl::setText):
  +        (HTMLBodyElementImpl::vLink):
  +        (HTMLBodyElementImpl::setVLink):
  +        (HTMLFrameElementImpl::parseMappedAttribute):
  +        (HTMLFrameElementImpl::attach):
  +        (HTMLFrameElementImpl::isURLAttribute):
  +        (HTMLFrameElementImpl::frameBorder):
  +        (HTMLFrameElementImpl::setFrameBorder):
  +        (HTMLFrameElementImpl::longDesc):
  +        (HTMLFrameElementImpl::setLongDesc):
  +        (HTMLFrameElementImpl::marginHeight):
  +        (HTMLFrameElementImpl::setMarginHeight):
  +        (HTMLFrameElementImpl::marginWidth):
  +        (HTMLFrameElementImpl::setMarginWidth):
  +        (HTMLFrameElementImpl::name):
  +        (HTMLFrameElementImpl::setName):
  +        (HTMLFrameElementImpl::setNoResize):
  +        (HTMLFrameElementImpl::scrolling):
  +        (HTMLFrameElementImpl::setScrolling):
  +        (HTMLFrameElementImpl::src):
  +        (HTMLFrameElementImpl::setSrc):
  +        (HTMLFrameSetElementImpl::parseMappedAttribute):
  +        (HTMLFrameSetElementImpl::cols):
  +        (HTMLFrameSetElementImpl::setCols):
  +        (HTMLFrameSetElementImpl::rows):
  +        (HTMLFrameSetElementImpl::setRows):
  +        (HTMLHeadElementImpl::profile):
  +        (HTMLHeadElementImpl::setProfile):
  +        (HTMLHtmlElementImpl::version):
  +        (HTMLHtmlElementImpl::setVersion):
  +        (HTMLIFrameElementImpl::mapToEntry):
  +        (HTMLIFrameElementImpl::parseMappedAttribute):
  +        (HTMLIFrameElementImpl::attach):
  +        (HTMLIFrameElementImpl::isURLAttribute):
  +        (HTMLIFrameElementImpl::align):
  +        (HTMLIFrameElementImpl::setAlign):
  +        (HTMLIFrameElementImpl::height):
  +        (HTMLIFrameElementImpl::setHeight):
  +        (HTMLIFrameElementImpl::src):
  +        (HTMLIFrameElementImpl::width):
  +        (HTMLIFrameElementImpl::setWidth):
  +        * khtml/html/html_baseimpl.h:
  +        * khtml/html/html_blockimpl.cpp:
  +        (HTMLBlockquoteElementImpl::cite):
  +        (HTMLBlockquoteElementImpl::setCite):
  +        (HTMLDivElementImpl::mapToEntry):
  +        (HTMLDivElementImpl::parseMappedAttribute):
  +        (HTMLDivElementImpl::align):
  +        (HTMLDivElementImpl::setAlign):
  +        (HTMLHRElementImpl::mapToEntry):
  +        (HTMLHRElementImpl::parseMappedAttribute):
  +        (HTMLHRElementImpl::align):
  +        (HTMLHRElementImpl::setAlign):
  +        (HTMLHRElementImpl::noShade):
  +        (HTMLHRElementImpl::setNoShade):
  +        (HTMLHRElementImpl::size):
  +        (HTMLHRElementImpl::setSize):
  +        (HTMLHRElementImpl::width):
  +        (HTMLHRElementImpl::setWidth):
  +        (HTMLHeadingElementImpl::align):
  +        (HTMLHeadingElementImpl::setAlign):
  +        (HTMLParagraphElementImpl::mapToEntry):
  +        (HTMLParagraphElementImpl::parseMappedAttribute):
  +        (HTMLParagraphElementImpl::align):
  +        (HTMLParagraphElementImpl::setAlign):
  +        (HTMLPreElementImpl::width):
  +        (HTMLPreElementImpl::setWidth):
  +        (HTMLMarqueeElementImpl::mapToEntry):
  +        (HTMLMarqueeElementImpl::parseMappedAttribute):
  +        * khtml/html/html_blockimpl.h:
  +        * khtml/html/html_canvasimpl.cpp:
  +        (HTMLCanvasElementImpl::mapToEntry):
  +        (HTMLCanvasElementImpl::parseMappedAttribute):
  +        (HTMLCanvasElementImpl::isURLAttribute):
  +        * khtml/html/html_canvasimpl.h:
  +        * khtml/html/html_documentimpl.cpp:
  +        * khtml/html/html_elementimpl.cpp:
  +        (HTMLElementImpl::mapToEntry):
  +        (HTMLElementImpl::parseMappedAttribute):
  +        (HTMLElementImpl::setContentEditable):
  +        (HTMLElementImpl::id):
  +        (HTMLElementImpl::setId):
  +        (HTMLElementImpl::title):
  +        (HTMLElementImpl::setTitle):
  +        (HTMLElementImpl::lang):
  +        (HTMLElementImpl::setLang):
  +        (HTMLElementImpl::dir):
  +        (HTMLElementImpl::setDir):
  +        (HTMLElementImpl::className):
  +        (HTMLElementImpl::setClassName):
  +        * khtml/html/html_elementimpl.h:
  +        * khtml/html/html_formimpl.cpp:
  +        (DOM::HTMLFormElementImpl::parseMappedAttribute):
  +        (DOM::HTMLFormElementImpl::isURLAttribute):
  +        (DOM::HTMLFormElementImpl::name):
  +        (DOM::HTMLFormElementImpl::setName):
  +        (DOM::HTMLFormElementImpl::acceptCharset):
  +        (DOM::HTMLFormElementImpl::setAcceptCharset):
  +        (DOM::HTMLFormElementImpl::action):
  +        (DOM::HTMLFormElementImpl::setAction):
  +        (DOM::HTMLFormElementImpl::setEnctype):
  +        (DOM::HTMLFormElementImpl::method):
  +        (DOM::HTMLFormElementImpl::setMethod):
  +        (DOM::HTMLFormElementImpl::target):
  +        (DOM::HTMLFormElementImpl::setTarget):
  +        (DOM::HTMLGenericFormElementImpl::parseMappedAttribute):
  +        (DOM::HTMLGenericFormElementImpl::name):
  +        (DOM::HTMLGenericFormElementImpl::setName):
  +        (DOM::HTMLGenericFormElementImpl::setDisabled):
  +        (DOM::HTMLGenericFormElementImpl::setReadOnly):
  +        (DOM::HTMLGenericFormElementImpl::tabIndex):
  +        (DOM::HTMLGenericFormElementImpl::setTabIndex):
  +        (DOM::HTMLButtonElementImpl::type):
  +        (DOM::HTMLButtonElementImpl::parseMappedAttribute):
  +        (DOM::HTMLButtonElementImpl::accessKey):
  +        (DOM::HTMLButtonElementImpl::setAccessKey):
  +        (DOM::HTMLButtonElementImpl::value):
  +        (DOM::HTMLButtonElementImpl::setValue):
  +        (DOM::HTMLInputElementImpl::setType):
  +        (DOM::HTMLInputElementImpl::mapToEntry):
  +        (DOM::HTMLInputElementImpl::parseMappedAttribute):
  +        (DOM::HTMLInputElementImpl::attach):
  +        (DOM::HTMLInputElementImpl::altText):
  +        (DOM::HTMLInputElementImpl::value):
  +        (DOM::HTMLInputElementImpl::setValue):
  +        (DOM::HTMLInputElementImpl::isURLAttribute):
  +        (DOM::HTMLInputElementImpl::defaultValue):
  +        (DOM::HTMLInputElementImpl::setDefaultValue):
  +        (DOM::HTMLInputElementImpl::defaultChecked):
  +        (DOM::HTMLInputElementImpl::setDefaultChecked):
  +        (DOM::HTMLInputElementImpl::accept):
  +        (DOM::HTMLInputElementImpl::setAccept):
  +        (DOM::HTMLInputElementImpl::accessKey):
  +        (DOM::HTMLInputElementImpl::setAccessKey):
  +        (DOM::HTMLInputElementImpl::align):
  +        (DOM::HTMLInputElementImpl::setAlign):
  +        (DOM::HTMLInputElementImpl::alt):
  +        (DOM::HTMLInputElementImpl::setAlt):
  +        (DOM::HTMLInputElementImpl::setMaxLength):
  +        (DOM::HTMLInputElementImpl::setSize):
  +        (DOM::HTMLInputElementImpl::src):
  +        (DOM::HTMLInputElementImpl::setSrc):
  +        (DOM::HTMLInputElementImpl::useMap):
  +        (DOM::HTMLInputElementImpl::setUseMap):
  +        (DOM::HTMLLabelElementImpl::parseMappedAttribute):
  +        (DOM::HTMLLabelElementImpl::formElement):
  +        (DOM::HTMLLabelElementImpl::accessKey):
  +        (DOM::HTMLLabelElementImpl::setAccessKey):
  +        (DOM::HTMLLabelElementImpl::htmlFor):
  +        (DOM::HTMLLabelElementImpl::setHtmlFor):
  +        (DOM::HTMLLegendElementImpl::accessKey):
  +        (DOM::HTMLLegendElementImpl::setAccessKey):
  +        (DOM::HTMLLegendElementImpl::align):
  +        (DOM::HTMLLegendElementImpl::setAlign):
  +        (DOM::HTMLSelectElementImpl::parseMappedAttribute):
  +        (DOM::HTMLSelectElementImpl::reset):
  +        (DOM::HTMLSelectElementImpl::setMultiple):
  +        (DOM::HTMLSelectElementImpl::setSize):
  +        (DOM::HTMLKeygenElementImpl::parseMappedAttribute):
  +        (DOM::HTMLOptGroupElementImpl::label):
  +        (DOM::HTMLOptGroupElementImpl::setLabel):
  +        (DOM::HTMLOptionElementImpl::text):
  +        (DOM::HTMLOptionElementImpl::parseMappedAttribute):
  +        (DOM::HTMLOptionElementImpl::setValue):
  +        (DOM::HTMLOptionElementImpl::defaultSelected):
  +        (DOM::HTMLOptionElementImpl::setDefaultSelected):
  +        (DOM::HTMLOptionElementImpl::label):
  +        (DOM::HTMLOptionElementImpl::setLabel):
  +        (DOM::HTMLTextAreaElementImpl::parseMappedAttribute):
  +        (DOM::HTMLTextAreaElementImpl::accessKey):
  +        (DOM::HTMLTextAreaElementImpl::setAccessKey):
  +        (DOM::HTMLTextAreaElementImpl::setCols):
  +        (DOM::HTMLTextAreaElementImpl::setRows):
  +        (DOM::HTMLIsIndexElementImpl::parseMappedAttribute):
  +        (DOM::HTMLIsIndexElementImpl::prompt):
  +        (DOM::HTMLIsIndexElementImpl::setPrompt):
  +        * khtml/html/html_formimpl.h:
  +        * khtml/html/html_headimpl.cpp:
  +        (HTMLBaseElementImpl::parseMappedAttribute):
  +        (HTMLBaseElementImpl::setHref):
  +        (HTMLBaseElementImpl::setTarget):
  +        (HTMLLinkElementImpl::parseMappedAttribute):
  +        (HTMLLinkElementImpl::process):
  +        (HTMLLinkElementImpl::isURLAttribute):
  +        (HTMLLinkElementImpl::disabled):
  +        (HTMLLinkElementImpl::setDisabled):
  +        (HTMLLinkElementImpl::charset):
  +        (HTMLLinkElementImpl::setCharset):
  +        (HTMLLinkElementImpl::href):
  +        (HTMLLinkElementImpl::setHref):
  +        (HTMLLinkElementImpl::hreflang):
  +        (HTMLLinkElementImpl::setHreflang):
  +        (HTMLLinkElementImpl::media):
  +        (HTMLLinkElementImpl::setMedia):
  +        (HTMLLinkElementImpl::rel):
  +        (HTMLLinkElementImpl::setRel):
  +        (HTMLLinkElementImpl::rev):
  +        (HTMLLinkElementImpl::setRev):
  +        (HTMLLinkElementImpl::target):
  +        (HTMLLinkElementImpl::setTarget):
  +        (HTMLLinkElementImpl::type):
  +        (HTMLLinkElementImpl::setType):
  +        (HTMLMetaElementImpl::parseMappedAttribute):
  +        (HTMLMetaElementImpl::content):
  +        (HTMLMetaElementImpl::setContent):
  +        (HTMLMetaElementImpl::httpEquiv):
  +        (HTMLMetaElementImpl::setHttpEquiv):
  +        (HTMLMetaElementImpl::name):
  +        (HTMLMetaElementImpl::setName):
  +        (HTMLMetaElementImpl::scheme):
  +        (HTMLMetaElementImpl::setScheme):
  +        (HTMLScriptElementImpl::isURLAttribute):
  +        (HTMLScriptElementImpl::insertedIntoDocument):
  +        (HTMLScriptElementImpl::charset):
  +        (HTMLScriptElementImpl::setCharset):
  +        (HTMLScriptElementImpl::defer):
  +        (HTMLScriptElementImpl::setDefer):
  +        (HTMLScriptElementImpl::src):
  +        (HTMLScriptElementImpl::setSrc):
  +        (HTMLScriptElementImpl::type):
  +        (HTMLScriptElementImpl::setType):
  +        (HTMLStyleElementImpl::parseMappedAttribute):
  +        (HTMLStyleElementImpl::disabled):
  +        (HTMLStyleElementImpl::setDisabled):
  +        (HTMLStyleElementImpl::media):
  +        (HTMLStyleElementImpl::setMedia):
  +        (HTMLStyleElementImpl::type):
  +        (HTMLStyleElementImpl::setType):
  +        * khtml/html/html_imageimpl.cpp:
  +        (HTMLImageLoader::updateFromElement):
  +        (HTMLImageElementImpl::mapToEntry):
  +        (HTMLImageElementImpl::parseMappedAttribute):
  +        (HTMLImageElementImpl::altText):
  +        (HTMLImageElementImpl::width):
  +        (HTMLImageElementImpl::height):
  +        (HTMLImageElementImpl::isURLAttribute):
  +        (HTMLImageElementImpl::name):
  +        (HTMLImageElementImpl::setName):
  +        (HTMLImageElementImpl::align):
  +        (HTMLImageElementImpl::setAlign):
  +        (HTMLImageElementImpl::alt):
  +        (HTMLImageElementImpl::setAlt):
  +        (HTMLImageElementImpl::border):
  +        (HTMLImageElementImpl::setBorder):
  +        (HTMLImageElementImpl::setHeight):
  +        (HTMLImageElementImpl::hspace):
  +        (HTMLImageElementImpl::setHspace):
  +        (HTMLImageElementImpl::isMap):
  +        (HTMLImageElementImpl::setIsMap):
  +        (HTMLImageElementImpl::longDesc):
  +        (HTMLImageElementImpl::setLongDesc):
  +        (HTMLImageElementImpl::src):
  +        (HTMLImageElementImpl::setSrc):
  +        (HTMLImageElementImpl::useMap):
  +        (HTMLImageElementImpl::setUseMap):
  +        (HTMLImageElementImpl::vspace):
  +        (HTMLImageElementImpl::setVspace):
  +        (HTMLImageElementImpl::setWidth):
  +        (HTMLMapElementImpl::parseMappedAttribute):
  +        (HTMLMapElementImpl::name):
  +        (HTMLMapElementImpl::setName):
  +        (HTMLAreaElementImpl::parseMappedAttribute):
  +        (HTMLAreaElementImpl::accessKey):
  +        (HTMLAreaElementImpl::setAccessKey):
  +        (HTMLAreaElementImpl::alt):
  +        (HTMLAreaElementImpl::setAlt):
  +        (HTMLAreaElementImpl::coords):
  +        (HTMLAreaElementImpl::setCoords):
  +        (HTMLAreaElementImpl::href):
  +        (HTMLAreaElementImpl::setHref):
  +        (HTMLAreaElementImpl::noHref):
  +        (HTMLAreaElementImpl::setNoHref):
  +        (HTMLAreaElementImpl::shape):
  +        (HTMLAreaElementImpl::setShape):
  +        (HTMLAreaElementImpl::tabIndex):
  +        (HTMLAreaElementImpl::setTabIndex):
  +        (HTMLAreaElementImpl::target):
  +        (HTMLAreaElementImpl::setTarget):
  +        * khtml/html/html_imageimpl.h:
  +        * khtml/html/html_inlineimpl.cpp:
  +        (DOM::HTMLAnchorElementImpl::defaultEventHandler):
  +        (DOM::HTMLAnchorElementImpl::parseMappedAttribute):
  +        (DOM::HTMLAnchorElementImpl::isURLAttribute):
  +        (DOM::HTMLAnchorElementImpl::accessKey):
  +        (DOM::HTMLAnchorElementImpl::setAccessKey):
  +        (DOM::HTMLAnchorElementImpl::charset):
  +        (DOM::HTMLAnchorElementImpl::setCharset):
  +        (DOM::HTMLAnchorElementImpl::coords):
  +        (DOM::HTMLAnchorElementImpl::setCoords):
  +        (DOM::HTMLAnchorElementImpl::href):
  +        (DOM::HTMLAnchorElementImpl::setHref):
  +        (DOM::HTMLAnchorElementImpl::hreflang):
  +        (DOM::HTMLAnchorElementImpl::setHreflang):
  +        (DOM::HTMLAnchorElementImpl::name):
  +        (DOM::HTMLAnchorElementImpl::setName):
  +        (DOM::HTMLAnchorElementImpl::rel):
  +        (DOM::HTMLAnchorElementImpl::setRel):
  +        (DOM::HTMLAnchorElementImpl::rev):
  +        (DOM::HTMLAnchorElementImpl::setRev):
  +        (DOM::HTMLAnchorElementImpl::shape):
  +        (DOM::HTMLAnchorElementImpl::setShape):
  +        (DOM::HTMLAnchorElementImpl::tabIndex):
  +        (DOM::HTMLAnchorElementImpl::setTabIndex):
  +        (DOM::HTMLAnchorElementImpl::target):
  +        (DOM::HTMLAnchorElementImpl::setTarget):
  +        (DOM::HTMLAnchorElementImpl::type):
  +        (DOM::HTMLAnchorElementImpl::setType):
  +        (DOM::HTMLBRElementImpl::mapToEntry):
  +        (DOM::HTMLBRElementImpl::parseMappedAttribute):
  +        (DOM::HTMLBRElementImpl::clear):
  +        (DOM::HTMLBRElementImpl::setClear):
  +        (DOM::HTMLFontElementImpl::mapToEntry):
  +        (DOM::HTMLFontElementImpl::parseMappedAttribute):
  +        (DOM::HTMLFontElementImpl::color):
  +        (DOM::HTMLFontElementImpl::setColor):
  +        (DOM::HTMLFontElementImpl::face):
  +        (DOM::HTMLFontElementImpl::setFace):
  +        (DOM::HTMLFontElementImpl::size):
  +        (DOM::HTMLFontElementImpl::setSize):
  +        (DOM::HTMLModElementImpl::cite):
  +        (DOM::HTMLModElementImpl::setCite):
  +        (DOM::HTMLModElementImpl::dateTime):
  +        (DOM::HTMLModElementImpl::setDateTime):
  +        (DOM::HTMLQuoteElementImpl::cite):
  +        (DOM::HTMLQuoteElementImpl::setCite):
  +        * khtml/html/html_inlineimpl.h:
  +        * khtml/html/html_listimpl.cpp:
  +        (DOM::HTMLUListElementImpl::mapToEntry):
  +        (DOM::HTMLUListElementImpl::parseMappedAttribute):
  +        (DOM::HTMLUListElementImpl::compact):
  +        (DOM::HTMLUListElementImpl::setCompact):
  +        (DOM::HTMLUListElementImpl::type):
  +        (DOM::HTMLUListElementImpl::setType):
  +        (DOM::HTMLDirectoryElementImpl::compact):
  +        (DOM::HTMLDirectoryElementImpl::setCompact):
  +        (DOM::HTMLMenuElementImpl::compact):
  +        (DOM::HTMLMenuElementImpl::setCompact):
  +        (DOM::HTMLOListElementImpl::mapToEntry):
  +        (DOM::HTMLOListElementImpl::parseMappedAttribute):
  +        (DOM::HTMLOListElementImpl::compact):
  +        (DOM::HTMLOListElementImpl::setCompact):
  +        (DOM::HTMLOListElementImpl::setStart):
  +        (DOM::HTMLOListElementImpl::type):
  +        (DOM::HTMLOListElementImpl::setType):
  +        (DOM::HTMLLIElementImpl::mapToEntry):
  +        (DOM::HTMLLIElementImpl::parseMappedAttribute):
  +        (DOM::HTMLLIElementImpl::type):
  +        (DOM::HTMLLIElementImpl::setType):
  +        (DOM::HTMLLIElementImpl::value):
  +        (DOM::HTMLLIElementImpl::setValue):
  +        (DOM::HTMLDListElementImpl::compact):
  +        (DOM::HTMLDListElementImpl::setCompact):
  +        * khtml/html/html_listimpl.h:
  +        * khtml/html/html_miscimpl.cpp:
  +        (DOM::HTMLBaseFontElementImpl::color):
  +        (DOM::HTMLBaseFontElementImpl::setColor):
  +        (DOM::HTMLBaseFontElementImpl::face):
  +        (DOM::HTMLBaseFontElementImpl::setFace):
  +        (DOM::HTMLBaseFontElementImpl::size):
  +        (DOM::HTMLBaseFontElementImpl::setSize):
  +        (DOM::HTMLCollectionImpl::traverseNextItem):
  +        (DOM::HTMLCollectionImpl::checkForNameMatch):
  +        (DOM::HTMLCollectionImpl::updateNameCache):
  +        (DOM::HTMLFormCollectionImpl::getNamedItem):
  +        (DOM::HTMLFormCollectionImpl::getNamedFormItem):
  +        (DOM::HTMLFormCollectionImpl::nextNamedItemInternal):
  +        (DOM::HTMLFormCollectionImpl::namedItem):
  +        (DOM::HTMLFormCollectionImpl::nextNamedItem):
  +        (DOM::HTMLFormCollectionImpl::updateNameCache):
  +        * khtml/html/html_miscimpl.h:
  +        * khtml/html/html_objectimpl.cpp:
  +        (DOM::HTMLAppletElementImpl::mapToEntry):
  +        (DOM::HTMLAppletElementImpl::parseMappedAttribute):
  +        (DOM::HTMLAppletElementImpl::rendererIsNeeded):
  +        (DOM::HTMLAppletElementImpl::createRenderer):
  +        (DOM::HTMLAppletElementImpl::align):
  +        (DOM::HTMLAppletElementImpl::setAlign):
  +        (DOM::HTMLAppletElementImpl::alt):
  +        (DOM::HTMLAppletElementImpl::setAlt):
  +        (DOM::HTMLAppletElementImpl::archive):
  +        (DOM::HTMLAppletElementImpl::setArchive):
  +        (DOM::HTMLAppletElementImpl::code):
  +        (DOM::HTMLAppletElementImpl::setCode):
  +        (DOM::HTMLAppletElementImpl::codeBase):
  +        (DOM::HTMLAppletElementImpl::setCodeBase):
  +        (DOM::HTMLAppletElementImpl::height):
  +        (DOM::HTMLAppletElementImpl::setHeight):
  +        (DOM::HTMLAppletElementImpl::hspace):
  +        (DOM::HTMLAppletElementImpl::setHspace):
  +        (DOM::HTMLAppletElementImpl::name):
  +        (DOM::HTMLAppletElementImpl::setName):
  +        (DOM::HTMLAppletElementImpl::object):
  +        (DOM::HTMLAppletElementImpl::setObject):
  +        (DOM::HTMLAppletElementImpl::vspace):
  +        (DOM::HTMLAppletElementImpl::setVspace):
  +        (DOM::HTMLAppletElementImpl::width):
  +        (DOM::HTMLAppletElementImpl::setWidth):
  +        (DOM::HTMLEmbedElementImpl::mapToEntry):
  +        (DOM::HTMLEmbedElementImpl::parseMappedAttribute):
  +        (DOM::HTMLEmbedElementImpl::isURLAttribute):
  +        (DOM::HTMLObjectElementImpl::mapToEntry):
  +        (DOM::HTMLObjectElementImpl::parseMappedAttribute):
  +        (DOM::HTMLObjectElementImpl::isURLAttribute):
  +        (DOM::HTMLObjectElementImpl::code):
  +        (DOM::HTMLObjectElementImpl::setCode):
  +        (DOM::HTMLObjectElementImpl::align):
  +        (DOM::HTMLObjectElementImpl::setAlign):
  +        (DOM::HTMLObjectElementImpl::archive):
  +        (DOM::HTMLObjectElementImpl::setArchive):
  +        (DOM::HTMLObjectElementImpl::border):
  +        (DOM::HTMLObjectElementImpl::setBorder):
  +        (DOM::HTMLObjectElementImpl::codeBase):
  +        (DOM::HTMLObjectElementImpl::setCodeBase):
  +        (DOM::HTMLObjectElementImpl::codeType):
  +        (DOM::HTMLObjectElementImpl::setCodeType):
  +        (DOM::HTMLObjectElementImpl::data):
  +        (DOM::HTMLObjectElementImpl::setData):
  +        (DOM::HTMLObjectElementImpl::declare):
  +        (DOM::HTMLObjectElementImpl::setDeclare):
  +        (DOM::HTMLObjectElementImpl::height):
  +        (DOM::HTMLObjectElementImpl::setHeight):
  +        (DOM::HTMLObjectElementImpl::hspace):
  +        (DOM::HTMLObjectElementImpl::setHspace):
  +        (DOM::HTMLObjectElementImpl::name):
  +        (DOM::HTMLObjectElementImpl::setName):
  +        (DOM::HTMLObjectElementImpl::standby):
  +        (DOM::HTMLObjectElementImpl::setStandby):
  +        (DOM::HTMLObjectElementImpl::tabIndex):
  +        (DOM::HTMLObjectElementImpl::setTabIndex):
  +        (DOM::HTMLObjectElementImpl::type):
  +        (DOM::HTMLObjectElementImpl::setType):
  +        (DOM::HTMLObjectElementImpl::useMap):
  +        (DOM::HTMLObjectElementImpl::setUseMap):
  +        (DOM::HTMLObjectElementImpl::vspace):
  +        (DOM::HTMLObjectElementImpl::setVspace):
  +        (DOM::HTMLObjectElementImpl::width):
  +        (DOM::HTMLObjectElementImpl::setWidth):
  +        (DOM::HTMLParamElementImpl::parseMappedAttribute):
  +        (DOM::HTMLParamElementImpl::isURLAttribute):
  +        (DOM::HTMLParamElementImpl::setName):
  +        (DOM::HTMLParamElementImpl::type):
  +        (DOM::HTMLParamElementImpl::setType):
  +        (DOM::HTMLParamElementImpl::setValue):
  +        (DOM::HTMLParamElementImpl::valueType):
  +        (DOM::HTMLParamElementImpl::setValueType):
  +        * khtml/html/html_objectimpl.h:
  +        * khtml/html/html_tableimpl.cpp:
  +        (DOM::HTMLTableElementImpl::mapToEntry):
  +        (DOM::HTMLTableElementImpl::parseMappedAttribute):
  +        (DOM::HTMLTableElementImpl::additionalAttributeStyleDecl):
  +        (DOM::HTMLTableElementImpl::getSharedCellDecl):
  +        (DOM::HTMLTableElementImpl::isURLAttribute):
  +        (DOM::HTMLTableElementImpl::align):
  +        (DOM::HTMLTableElementImpl::setAlign):
  +        (DOM::HTMLTableElementImpl::bgColor):
  +        (DOM::HTMLTableElementImpl::setBgColor):
  +        (DOM::HTMLTableElementImpl::border):
  +        (DOM::HTMLTableElementImpl::setBorder):
  +        (DOM::HTMLTableElementImpl::cellPadding):
  +        (DOM::HTMLTableElementImpl::setCellPadding):
  +        (DOM::HTMLTableElementImpl::cellSpacing):
  +        (DOM::HTMLTableElementImpl::setCellSpacing):
  +        (DOM::HTMLTableElementImpl::frame):
  +        (DOM::HTMLTableElementImpl::setFrame):
  +        (DOM::HTMLTableElementImpl::rules):
  +        (DOM::HTMLTableElementImpl::setRules):
  +        (DOM::HTMLTableElementImpl::summary):
  +        (DOM::HTMLTableElementImpl::setSummary):
  +        (DOM::HTMLTableElementImpl::width):
  +        (DOM::HTMLTableElementImpl::setWidth):
  +        (DOM::HTMLTablePartElementImpl::mapToEntry):
  +        (DOM::HTMLTablePartElementImpl::parseMappedAttribute):
  +        (DOM::HTMLTableSectionElementImpl::align):
  +        (DOM::HTMLTableSectionElementImpl::setAlign):
  +        (DOM::HTMLTableSectionElementImpl::ch):
  +        (DOM::HTMLTableSectionElementImpl::setCh):
  +        (DOM::HTMLTableSectionElementImpl::chOff):
  +        (DOM::HTMLTableSectionElementImpl::setChOff):
  +        (DOM::HTMLTableSectionElementImpl::vAlign):
  +        (DOM::HTMLTableSectionElementImpl::setVAlign):
  +        (DOM::HTMLTableRowElementImpl::align):
  +        (DOM::HTMLTableRowElementImpl::setAlign):
  +        (DOM::HTMLTableRowElementImpl::bgColor):
  +        (DOM::HTMLTableRowElementImpl::setBgColor):
  +        (DOM::HTMLTableRowElementImpl::ch):
  +        (DOM::HTMLTableRowElementImpl::setCh):
  +        (DOM::HTMLTableRowElementImpl::chOff):
  +        (DOM::HTMLTableRowElementImpl::setChOff):
  +        (DOM::HTMLTableRowElementImpl::vAlign):
  +        (DOM::HTMLTableRowElementImpl::setVAlign):
  +        (DOM::HTMLTableCellElementImpl::mapToEntry):
  +        (DOM::HTMLTableCellElementImpl::parseMappedAttribute):
  +        (DOM::HTMLTableCellElementImpl::isURLAttribute):
  +        (DOM::HTMLTableCellElementImpl::abbr):
  +        (DOM::HTMLTableCellElementImpl::setAbbr):
  +        (DOM::HTMLTableCellElementImpl::align):
  +        (DOM::HTMLTableCellElementImpl::setAlign):
  +        (DOM::HTMLTableCellElementImpl::axis):
  +        (DOM::HTMLTableCellElementImpl::setAxis):
  +        (DOM::HTMLTableCellElementImpl::bgColor):
  +        (DOM::HTMLTableCellElementImpl::setBgColor):
  +        (DOM::HTMLTableCellElementImpl::ch):
  +        (DOM::HTMLTableCellElementImpl::setCh):
  +        (DOM::HTMLTableCellElementImpl::chOff):
  +        (DOM::HTMLTableCellElementImpl::setChOff):
  +        (DOM::HTMLTableCellElementImpl::setColSpan):
  +        (DOM::HTMLTableCellElementImpl::headers):
  +        (DOM::HTMLTableCellElementImpl::setHeaders):
  +        (DOM::HTMLTableCellElementImpl::height):
  +        (DOM::HTMLTableCellElementImpl::setHeight):
  +        (DOM::HTMLTableCellElementImpl::noWrap):
  +        (DOM::HTMLTableCellElementImpl::setNoWrap):
  +        (DOM::HTMLTableCellElementImpl::setRowSpan):
  +        (DOM::HTMLTableCellElementImpl::scope):
  +        (DOM::HTMLTableCellElementImpl::setScope):
  +        (DOM::HTMLTableCellElementImpl::vAlign):
  +        (DOM::HTMLTableCellElementImpl::setVAlign):
  +        (DOM::HTMLTableCellElementImpl::width):
  +        (DOM::HTMLTableCellElementImpl::setWidth):
  +        (DOM::HTMLTableColElementImpl::mapToEntry):
  +        (DOM::HTMLTableColElementImpl::parseMappedAttribute):
  +        (DOM::HTMLTableColElementImpl::align):
  +        (DOM::HTMLTableColElementImpl::setAlign):
  +        (DOM::HTMLTableColElementImpl::ch):
  +        (DOM::HTMLTableColElementImpl::setCh):
  +        (DOM::HTMLTableColElementImpl::chOff):
  +        (DOM::HTMLTableColElementImpl::setChOff):
  +        (DOM::HTMLTableColElementImpl::setSpan):
  +        (DOM::HTMLTableColElementImpl::vAlign):
  +        (DOM::HTMLTableColElementImpl::setVAlign):
  +        (DOM::HTMLTableColElementImpl::width):
  +        (DOM::HTMLTableColElementImpl::setWidth):
  +        (DOM::HTMLTableCaptionElementImpl::mapToEntry):
  +        (DOM::HTMLTableCaptionElementImpl::parseMappedAttribute):
  +        (DOM::HTMLTableCaptionElementImpl::align):
  +        (DOM::HTMLTableCaptionElementImpl::setAlign):
  +        * khtml/html/html_tableimpl.h:
  +        * khtml/html/htmlnames.cpp:
  +        (DOM::HTMLNames::init):
  +        (DOM::HTMLAttributes::init):
  +        * khtml/html/htmlnames.h:
  +        * khtml/html/htmlparser.cpp:
  +        (HTMLParser::handleError):
  +        (HTMLParser::framesetCreateErrorCheck):
  +        (HTMLParser::handleIsindex):
  +        * khtml/html/htmltokenizer.cpp:
  +        (khtml::Token::addAttribute):
  +        (khtml::HTMLTokenizer::HTMLTokenizer):
  +        (khtml::HTMLTokenizer::parseTag):
  +        (khtml::HTMLTokenizer::processToken):
  +        * khtml/html/htmltokenizer.h:
  +        * khtml/khtml_part.cpp:
  +        (KHTMLPart::init):
  +        (KHTMLPart::backgroundURL):
  +        (KHTMLPart::updateActions):
  +        (KHTMLPart::handleMouseMoveEventDrag):
  +        (KHTMLPart::selectionComputedStyle):
  +        (KHTMLPart::applyEditingStyleToElement):
  +        (KHTMLPart::removeEditingStyleFromElement):
  +        * khtml/khtmlview.cpp:
  +        * khtml/misc/decoder.cpp:
  +        * khtml/misc/htmlattrs.in: Removed.
  +        * khtml/misc/htmlhashes.cpp: Removed.
  +        * khtml/misc/htmlhashes.h: Removed.
  +        * khtml/misc/htmltags.in: Removed.
  +        * khtml/misc/makeattrs: Removed.
  +        * khtml/misc/maketags: Removed.
  +        * khtml/rendering/render_box.cpp:
  +        * khtml/rendering/render_form.cpp:
  +        (RenderLineEdit::updateFromElement):
  +        (RenderSelect::updateFromElement):
  +        (RenderSlider::updateFromElement):
  +        (RenderSlider::slotSliderValueChanged):
  +        * khtml/rendering/render_frames.cpp:
  +        (RenderPartObject::updateWidget):
  +        * khtml/rendering/render_object.cpp:
  +        * khtml/rendering/render_table.cpp:
  +        (RenderTableCell::calcMinMaxWidth):
  +        * khtml/xml/dom_docimpl.cpp:
  +        (DocumentImpl::createElement):
  +        (DocumentImpl::importNode):
  +        (DocumentImpl::createElementNS):
  +        (DocumentImpl::getElementById):
  +        (DocumentImpl::getElementByAccessKey):
  +        (DocumentImpl::prepareMouseEvent):
  +        (DocumentImpl::recalcStyleSelector):
  +        (DocumentImpl::createAttributeNS):
  +        * khtml/xml/dom_docimpl.h:
  +        * khtml/xml/dom_elementimpl.cpp:
  +        (AttributeImpl::clone):
  +        (AttributeImpl::allocateImpl):
  +        (AttrImpl::AttrImpl):
  +        (AttrImpl::~AttrImpl):
  +        (AttrImpl::nodeName):
  +        (AttrImpl::name):
  +        (ElementImpl::removeAttribute):
  +        (ElementImpl::setAttribute):
  +        (ElementImpl::getAttribute):
  +        (ElementImpl::getAttributeNS):
  +        (ElementImpl::createAttribute):
  +        (ElementImpl::setAttributeMap):
  +        (ElementImpl::nodeName):
  +        (ElementImpl::insertedIntoDocument):
  +        (ElementImpl::removedFromDocument):
  +        (ElementImpl::openTagStartToString):
  +        (ElementImpl::dump):
  +        (ElementImpl::formatForDebugger):
  +        (ElementImpl::removeAttributeNode):
  +        (ElementImpl::setAttributeNS):
  +        (ElementImpl::removeAttributeNS):
  +        (ElementImpl::getAttributeNodeNS):
  +        (ElementImpl::hasAttributeNS):
  +        (NamedAttrMapImpl::getNamedItem):
  +        (NamedAttrMapImpl::setNamedItem):
  +        (NamedAttrMapImpl::removeNamedItem):
  +        (NamedAttrMapImpl::getAttributeItem):
  +        (NamedAttrMapImpl::clearAttributes):
  +        (NamedAttrMapImpl::operator=):
  +        (NamedAttrMapImpl::addAttribute):
  +        (NamedAttrMapImpl::removeAttribute):
  +        (StyledElementImpl::getMappedAttributeDecl):
  +        (StyledElementImpl::setMappedAttributeDecl):
  +        (StyledElementImpl::removeMappedAttributeDecl):
  +        (StyledElementImpl::updateStyleAttributeIfNeeded):
  +        (MappedAttributeImpl::clone):
  +        (NamedMappedAttrMapImpl::mapsEquivalent):
  +        (StyledElementImpl::createAttribute):
  +        (StyledElementImpl::attributeChanged):
  +        (StyledElementImpl::mapToEntry):
  +        (StyledElementImpl::parseMappedAttribute):
  +        * khtml/xml/dom_elementimpl.h:
  +        (DOM::AttributeImpl::AttributeImpl):
  +        (DOM::AttributeImpl::value):
  +        (DOM::AttributeImpl::prefix):
  +        (DOM::AttributeImpl::localName):
  +        (DOM::AttributeImpl::namespaceURI):
  +        (DOM::AttributeImpl::name):
  +        (DOM::AttributeImpl::attrImpl):
  +        (DOM::AttributeImpl::isNull):
  +        (DOM::AttributeImpl::isEmpty):
  +        (DOM::AttributeImpl::setValue):
  +        (DOM::AttributeImpl::setPrefix):
  +        (DOM::NamedAttrMapImpl::insertAttribute):
  +        (DOM::CSSMappedAttributeDeclarationImpl::CSSMappedAttributeDeclarationImpl):
  +        (DOM::CSSMappedAttributeDeclarationImpl::setMappedState):
  +        (DOM::MappedAttributeImpl::MappedAttributeImpl):
  +        (DOM::StyledElementImpl::isMappedAttribute):
  +        * khtml/xml/dom_nodeimpl.cpp:
  +        (DOM::NodeImpl::namespaceURI):
  +        (DOM::appendAttributeDesc):
  +        (DOM::NodeImpl::showNode):
  +        (DOM::NameNodeListImpl::nodeMatches):
  +        (DOM::NamedNodeMapImpl::getNamedItemNS):
  +        (DOM::NamedNodeMapImpl::removeNamedItemNS):
  +        * khtml/xml/dom_nodeimpl.h:
  +        * khtml/xml/dom_qname.cpp:
  +        (DOM::QualifiedName::toString):
  +        (DOM::QualifiedName::init):
  +        * khtml/xml/dom_qname.h:
  +        (DOM::anyQName):
  +        * khtml/xml/dom_textimpl.cpp:
  +        * khtml/xml/xml_tokenizer.cpp:
  +        (khtml::XMLTokenizer::startElement):
  +        (khtml::XMLTokenizer::insertErrorMessageBlock):
  +        (khtml::XMLTokenizer::executeScripts):
  +        * kwq/DOMHTML.h:
  +        * kwq/DOMHTML.mm:
  +        (-[DOMHTMLElement idName]):
  +        (-[DOMHTMLElement setIdName:]):
  +        (-[DOMHTMLElement title]):
  +        (-[DOMHTMLElement setTitle:]):
  +        (-[DOMHTMLElement lang]):
  +        (-[DOMHTMLElement setLang:]):
  +        (-[DOMHTMLElement dir]):
  +        (-[DOMHTMLElement setDir:]):
  +        (-[DOMHTMLElement className]):
  +        (-[DOMHTMLElement setClassName:]):
  +        (-[DOMHTMLHtmlElement version]):
  +        (-[DOMHTMLHtmlElement setVersion:]):
  +        (-[DOMHTMLHeadElement profile]):
  +        (-[DOMHTMLHeadElement setProfile:]):
  +        (-[DOMHTMLLinkElement disabled]):
  +        (-[DOMHTMLLinkElement setDisabled:]):
  +        (-[DOMHTMLLinkElement charset]):
  +        (-[DOMHTMLLinkElement setCharset:]):
  +        (-[DOMHTMLLinkElement setHref:]):
  +        (-[DOMHTMLLinkElement hreflang]):
  +        (-[DOMHTMLLinkElement setHreflang:]):
  +        (-[DOMHTMLLinkElement media]):
  +        (-[DOMHTMLLinkElement setMedia:]):
  +        (-[DOMHTMLLinkElement rel]):
  +        (-[DOMHTMLLinkElement setRel:]):
  +        (-[DOMHTMLLinkElement rev]):
  +        (-[DOMHTMLLinkElement setRev:]):
  +        (-[DOMHTMLLinkElement target]):
  +        (-[DOMHTMLLinkElement setTarget:]):
  +        (-[DOMHTMLLinkElement type]):
  +        (-[DOMHTMLLinkElement setType:]):
  +        (-[DOMHTMLTitleElement text]):
  +        (-[DOMHTMLTitleElement setText:]):
  +        (-[DOMHTMLMetaElement content]):
  +        (-[DOMHTMLMetaElement setContent:]):
  +        (-[DOMHTMLMetaElement httpEquiv]):
  +        (-[DOMHTMLMetaElement setHttpEquiv:]):
  +        (-[DOMHTMLMetaElement name]):
  +        (-[DOMHTMLMetaElement setName:]):
  +        (-[DOMHTMLMetaElement scheme]):
  +        (-[DOMHTMLMetaElement setScheme:]):
  +        (-[DOMHTMLBaseElement setHref:]):
  +        (-[DOMHTMLBaseElement target]):
  +        (-[DOMHTMLBaseElement setTarget:]):
  +        (-[DOMHTMLStyleElement disabled]):
  +        (-[DOMHTMLStyleElement setDisabled:]):
  +        (-[DOMHTMLStyleElement media]):
  +        (-[DOMHTMLStyleElement setMedia:]):
  +        (-[DOMHTMLStyleElement type]):
  +        (-[DOMHTMLStyleElement setType:]):
  +        (-[DOMHTMLBodyElement aLink]):
  +        (-[DOMHTMLBodyElement setALink:]):
  +        (-[DOMHTMLBodyElement background]):
  +        (-[DOMHTMLBodyElement setBackground:]):
  +        (-[DOMHTMLBodyElement bgColor]):
  +        (-[DOMHTMLBodyElement setBgColor:]):
  +        (-[DOMHTMLBodyElement link]):
  +        (-[DOMHTMLBodyElement setLink:]):
  +        (-[DOMHTMLBodyElement text]):
  +        (-[DOMHTMLBodyElement setText:]):
  +        (-[DOMHTMLBodyElement vLink]):
  +        (-[DOMHTMLBodyElement setVLink:]):
  +        (-[DOMHTMLFormElement name]):
  +        (-[DOMHTMLFormElement setName:]):
  +        (-[DOMHTMLFormElement acceptCharset]):
  +        (-[DOMHTMLFormElement setAcceptCharset:]):
  +        (-[DOMHTMLFormElement action]):
  +        (-[DOMHTMLFormElement setAction:]):
  +        (-[DOMHTMLFormElement enctype]):
  +        (-[DOMHTMLFormElement setEnctype:]):
  +        (-[DOMHTMLFormElement method]):
  +        (-[DOMHTMLFormElement setMethod:]):
  +        (-[DOMHTMLFormElement target]):
  +        (-[DOMHTMLFormElement setTarget:]):
  +        (-[DOMHTMLIsIndexElement prompt]):
  +        (-[DOMHTMLIsIndexElement setPrompt:]):
  +        (-[DOMHTMLSelectElement disabled]):
  +        (-[DOMHTMLSelectElement setDisabled:]):
  +        (-[DOMHTMLSelectElement multiple]):
  +        (-[DOMHTMLSelectElement setMultiple:]):
  +        (-[DOMHTMLSelectElement size]):
  +        (-[DOMHTMLSelectElement setSize:]):
  +        (-[DOMHTMLOptGroupElement disabled]):
  +        (-[DOMHTMLOptGroupElement setDisabled:]):
  +        (-[DOMHTMLOptGroupElement label]):
  +        (-[DOMHTMLOptGroupElement setLabel:]):
  +        (-[DOMHTMLOptionElement defaultSelected]):
  +        (-[DOMHTMLOptionElement setDefaultSelected:]):
  +        (-[DOMHTMLOptionElement disabled]):
  +        (-[DOMHTMLOptionElement setDisabled:]):
  +        (-[DOMHTMLOptionElement label]):
  +        (-[DOMHTMLOptionElement setLabel:]):
  +        (-[DOMHTMLInputElement defaultValue]):
  +        (-[DOMHTMLInputElement setDefaultValue:]):
  +        (-[DOMHTMLInputElement defaultChecked]):
  +        (-[DOMHTMLInputElement setDefaultChecked:]):
  +        (-[DOMHTMLInputElement accept]):
  +        (-[DOMHTMLInputElement setAccept:]):
  +        (-[DOMHTMLInputElement accessKey]):
  +        (-[DOMHTMLInputElement setAccessKey:]):
  +        (-[DOMHTMLInputElement align]):
  +        (-[DOMHTMLInputElement setAlign:]):
  +        (-[DOMHTMLInputElement alt]):
  +        (-[DOMHTMLInputElement setAlt:]):
  +        (-[DOMHTMLInputElement disabled]):
  +        (-[DOMHTMLInputElement setDisabled:]):
  +        (-[DOMHTMLInputElement maxLength]):
  +        (-[DOMHTMLInputElement setMaxLength:]):
  +        (-[DOMHTMLInputElement readOnly]):
  +        (-[DOMHTMLInputElement setReadOnly:]):
  +        (-[DOMHTMLInputElement size]):
  +        (-[DOMHTMLInputElement setSize:]):
  +        (-[DOMHTMLInputElement setSrc:]):
  +        (-[DOMHTMLInputElement useMap]):
  +        (-[DOMHTMLInputElement setUseMap:]):
  +        (-[DOMHTMLTextAreaElement accessKey]):
  +        (-[DOMHTMLTextAreaElement setAccessKey:]):
  +        (-[DOMHTMLTextAreaElement cols]):
  +        (-[DOMHTMLTextAreaElement setCols:]):
  +        (-[DOMHTMLTextAreaElement disabled]):
  +        (-[DOMHTMLTextAreaElement setDisabled:]):
  +        (-[DOMHTMLTextAreaElement readOnly]):
  +        (-[DOMHTMLTextAreaElement setReadOnly:]):
  +        (-[DOMHTMLTextAreaElement rows]):
  +        (-[DOMHTMLTextAreaElement setRows:]):
  +        (-[DOMHTMLButtonElement accessKey]):
  +        (-[DOMHTMLButtonElement setAccessKey:]):
  +        (-[DOMHTMLButtonElement disabled]):
  +        (-[DOMHTMLButtonElement setDisabled:]):
  +        (-[DOMHTMLButtonElement value]):
  +        (-[DOMHTMLButtonElement setValue:]):
  +        (-[DOMHTMLLabelElement accessKey]):
  +        (-[DOMHTMLLabelElement setAccessKey:]):
  +        (-[DOMHTMLLabelElement htmlFor]):
  +        (-[DOMHTMLLabelElement setHtmlFor:]):
  +        (-[DOMHTMLLegendElement accessKey]):
  +        (-[DOMHTMLLegendElement setAccessKey:]):
  +        (-[DOMHTMLLegendElement align]):
  +        (-[DOMHTMLLegendElement setAlign:]):
  +        (-[DOMHTMLUListElement compact]):
  +        (-[DOMHTMLUListElement setCompact:]):
  +        (-[DOMHTMLUListElement type]):
  +        (-[DOMHTMLUListElement setType:]):
  +        (-[DOMHTMLOListElement compact]):
  +        (-[DOMHTMLOListElement setCompact:]):
  +        (-[DOMHTMLOListElement start]):
  +        (-[DOMHTMLOListElement setStart:]):
  +        (-[DOMHTMLOListElement type]):
  +        (-[DOMHTMLOListElement setType:]):
  +        (-[DOMHTMLDListElement compact]):
  +        (-[DOMHTMLDListElement setCompact:]):
  +        (-[DOMHTMLDirectoryElement compact]):
  +        (-[DOMHTMLDirectoryElement setCompact:]):
  +        (-[DOMHTMLMenuElement compact]):
  +        (-[DOMHTMLMenuElement setCompact:]):
  +        (-[DOMHTMLLIElement type]):
  +        (-[DOMHTMLLIElement setType:]):
  +        (-[DOMHTMLLIElement value]):
  +        (-[DOMHTMLLIElement setValue:]):
  +        (-[DOMHTMLQuoteElement cite]):
  +        (-[DOMHTMLQuoteElement setCite:]):
  +        (-[DOMHTMLDivElement align]):
  +        (-[DOMHTMLDivElement setAlign:]):
  +        (-[DOMHTMLParagraphElement align]):
  +        (-[DOMHTMLParagraphElement setAlign:]):
  +        (-[DOMHTMLHeadingElement align]):
  +        (-[DOMHTMLHeadingElement setAlign:]):
  +        (-[DOMHTMLPreElement width]):
  +        (-[DOMHTMLPreElement setWidth:]):
  +        (-[DOMHTMLBRElement clear]):
  +        (-[DOMHTMLBRElement setClear:]):
  +        (-[DOMHTMLBaseFontElement color]):
  +        (-[DOMHTMLBaseFontElement setColor:]):
  +        (-[DOMHTMLBaseFontElement face]):
  +        (-[DOMHTMLBaseFontElement setFace:]):
  +        (-[DOMHTMLBaseFontElement size]):
  +        (-[DOMHTMLBaseFontElement setSize:]):
  +        (-[DOMHTMLFontElement color]):
  +        (-[DOMHTMLFontElement setColor:]):
  +        (-[DOMHTMLFontElement face]):
  +        (-[DOMHTMLFontElement setFace:]):
  +        (-[DOMHTMLFontElement size]):
  +        (-[DOMHTMLFontElement setSize:]):
  +        (-[DOMHTMLHRElement align]):
  +        (-[DOMHTMLHRElement setAlign:]):
  +        (-[DOMHTMLHRElement noShade]):
  +        (-[DOMHTMLHRElement setNoShade:]):
  +        (-[DOMHTMLHRElement size]):
  +        (-[DOMHTMLHRElement setSize:]):
  +        (-[DOMHTMLHRElement width]):
  +        (-[DOMHTMLHRElement setWidth:]):
  +        (-[DOMHTMLModElement cite]):
  +        (-[DOMHTMLModElement setCite:]):
  +        (-[DOMHTMLModElement dateTime]):
  +        (-[DOMHTMLModElement setDateTime:]):
  +        (-[DOMHTMLAnchorElement accessKey]):
  +        (-[DOMHTMLAnchorElement setAccessKey:]):
  +        (-[DOMHTMLAnchorElement charset]):
  +        (-[DOMHTMLAnchorElement setCharset:]):
  +        (-[DOMHTMLAnchorElement coords]):
  +        (-[DOMHTMLAnchorElement setCoords:]):
  +        (-[DOMHTMLAnchorElement setHref:]):
  +        (-[DOMHTMLAnchorElement hreflang]):
  +        (-[DOMHTMLAnchorElement setHreflang:]):
  +        (-[DOMHTMLAnchorElement name]):
  +        (-[DOMHTMLAnchorElement setName:]):
  +        (-[DOMHTMLAnchorElement rel]):
  +        (-[DOMHTMLAnchorElement setRel:]):
  +        (-[DOMHTMLAnchorElement rev]):
  +        (-[DOMHTMLAnchorElement setRev:]):
  +        (-[DOMHTMLAnchorElement shape]):
  +        (-[DOMHTMLAnchorElement setShape:]):
  +        (-[DOMHTMLAnchorElement tabIndex]):
  +        (-[DOMHTMLAnchorElement setTabIndex:]):
  +        (-[DOMHTMLAnchorElement target]):
  +        (-[DOMHTMLAnchorElement setTarget:]):
  +        (-[DOMHTMLAnchorElement type]):
  +        (-[DOMHTMLAnchorElement setType:]):
  +        (-[DOMHTMLImageElement name]):
  +        (-[DOMHTMLImageElement setName:]):
  +        (-[DOMHTMLImageElement align]):
  +        (-[DOMHTMLImageElement setAlign:]):
  +        (-[DOMHTMLImageElement alt]):
  +        (-[DOMHTMLImageElement setAlt:]):
  +        (-[DOMHTMLImageElement border]):
  +        (-[DOMHTMLImageElement setBorder:]):
  +        (-[DOMHTMLImageElement height]):
  +        (-[DOMHTMLImageElement setHeight:]):
  +        (-[DOMHTMLImageElement hspace]):
  +        (-[DOMHTMLImageElement setHspace:]):
  +        (-[DOMHTMLImageElement isMap]):
  +        (-[DOMHTMLImageElement setIsMap:]):
  +        (-[DOMHTMLImageElement longDesc]):
  +        (-[DOMHTMLImageElement setLongDesc:]):
  +        (-[DOMHTMLImageElement setSrc:]):
  +        (-[DOMHTMLImageElement useMap]):
  +        (-[DOMHTMLImageElement setUseMap:]):
  +        (-[DOMHTMLImageElement vspace]):
  +        (-[DOMHTMLImageElement setVspace:]):
  +        (-[DOMHTMLImageElement width]):
  +        (-[DOMHTMLImageElement setWidth:]):
  +        (-[DOMHTMLObjectElement code]):
  +        (-[DOMHTMLObjectElement setCode:]):
  +        (-[DOMHTMLObjectElement align]):
  +        (-[DOMHTMLObjectElement setAlign:]):
  +        (-[DOMHTMLObjectElement archive]):
  +        (-[DOMHTMLObjectElement setArchive:]):
  +        (-[DOMHTMLObjectElement border]):
  +        (-[DOMHTMLObjectElement setBorder:]):
  +        (-[DOMHTMLObjectElement codeBase]):
  +        (-[DOMHTMLObjectElement setCodeBase:]):
  +        (-[DOMHTMLObjectElement codeType]):
  +        (-[DOMHTMLObjectElement setCodeType:]):
  +        (-[DOMHTMLObjectElement data]):
  +        (-[DOMHTMLObjectElement setData:]):
  +        (-[DOMHTMLObjectElement declare]):
  +        (-[DOMHTMLObjectElement setDeclare:]):
  +        (-[DOMHTMLObjectElement height]):
  +        (-[DOMHTMLObjectElement setHeight:]):
  +        (-[DOMHTMLObjectElement hspace]):
  +        (-[DOMHTMLObjectElement setHspace:]):
  +        (-[DOMHTMLObjectElement name]):
  +        (-[DOMHTMLObjectElement setName:]):
  +        (-[DOMHTMLObjectElement standby]):
  +        (-[DOMHTMLObjectElement setStandby:]):
  +        (-[DOMHTMLObjectElement tabIndex]):
  +        (-[DOMHTMLObjectElement setTabIndex:]):
  +        (-[DOMHTMLObjectElement type]):
  +        (-[DOMHTMLObjectElement setType:]):
  +        (-[DOMHTMLObjectElement useMap]):
  +        (-[DOMHTMLObjectElement setUseMap:]):
  +        (-[DOMHTMLObjectElement vspace]):
  +        (-[DOMHTMLObjectElement setVspace:]):
  +        (-[DOMHTMLObjectElement width]):
  +        (-[DOMHTMLObjectElement setWidth:]):
  +        (-[DOMHTMLParamElement name]):
  +        (-[DOMHTMLParamElement setName:]):
  +        (-[DOMHTMLParamElement type]):
  +        (-[DOMHTMLParamElement setType:]):
  +        (-[DOMHTMLParamElement value]):
  +        (-[DOMHTMLParamElement setValue:]):
  +        (-[DOMHTMLParamElement valueType]):
  +        (-[DOMHTMLParamElement setValueType:]):
  +        (-[DOMHTMLAppletElement align]):
  +        (-[DOMHTMLAppletElement setAlign:]):
  +        (-[DOMHTMLAppletElement alt]):
  +        (-[DOMHTMLAppletElement setAlt:]):
  +        (-[DOMHTMLAppletElement archive]):
  +        (-[DOMHTMLAppletElement setArchive:]):
  +        (-[DOMHTMLAppletElement code]):
  +        (-[DOMHTMLAppletElement setCode:]):
  +        (-[DOMHTMLAppletElement codeBase]):
  +        (-[DOMHTMLAppletElement setCodeBase:]):
  +        (-[DOMHTMLAppletElement height]):
  +        (-[DOMHTMLAppletElement setHeight:]):
  +        (-[DOMHTMLAppletElement hspace]):
  +        (-[DOMHTMLAppletElement setHspace:]):
  +        (-[DOMHTMLAppletElement name]):
  +        (-[DOMHTMLAppletElement setName:]):
  +        (-[DOMHTMLAppletElement object]):
  +        (-[DOMHTMLAppletElement setObject:]):
  +        (-[DOMHTMLAppletElement vspace]):
  +        (-[DOMHTMLAppletElement setVspace:]):
  +        (-[DOMHTMLAppletElement width]):
  +        (-[DOMHTMLAppletElement setWidth:]):
  +        (-[DOMHTMLMapElement name]):
  +        (-[DOMHTMLMapElement setName:]):
  +        (-[DOMHTMLAreaElement accessKey]):
  +        (-[DOMHTMLAreaElement setAccessKey:]):
  +        (-[DOMHTMLAreaElement alt]):
  +        (-[DOMHTMLAreaElement setAlt:]):
  +        (-[DOMHTMLAreaElement coords]):
  +        (-[DOMHTMLAreaElement setCoords:]):
  +        (-[DOMHTMLAreaElement setHref:]):
  +        (-[DOMHTMLAreaElement noHref]):
  +        (-[DOMHTMLAreaElement setNoHref:]):
  +        (-[DOMHTMLAreaElement shape]):
  +        (-[DOMHTMLAreaElement setShape:]):
  +        (-[DOMHTMLAreaElement tabIndex]):
  +        (-[DOMHTMLAreaElement setTabIndex:]):
  +        (-[DOMHTMLAreaElement target]):
  +        (-[DOMHTMLAreaElement setTarget:]):
  +        (-[DOMHTMLScriptElement text]):
  +        (-[DOMHTMLScriptElement setText:]):
  +        (-[DOMHTMLScriptElement charset]):
  +        (-[DOMHTMLScriptElement setCharset:]):
  +        (-[DOMHTMLScriptElement defer]):
  +        (-[DOMHTMLScriptElement setDefer:]):
  +        (-[DOMHTMLScriptElement src]):
  +        (-[DOMHTMLScriptElement setSrc:]):
  +        (-[DOMHTMLScriptElement type]):
  +        (-[DOMHTMLScriptElement setType:]):
  +        (-[DOMHTMLTableCaptionElement align]):
  +        (-[DOMHTMLTableCaptionElement setAlign:]):
  +        (-[DOMHTMLTableSectionElement align]):
  +        (-[DOMHTMLTableSectionElement setAlign:]):
  +        (-[DOMHTMLTableSectionElement ch]):
  +        (-[DOMHTMLTableSectionElement setCh:]):
  +        (-[DOMHTMLTableSectionElement chOff]):
  +        (-[DOMHTMLTableSectionElement setChOff:]):
  +        (-[DOMHTMLTableSectionElement vAlign]):
  +        (-[DOMHTMLTableSectionElement setVAlign:]):
  +        (-[DOMHTMLTableElement align]):
  +        (-[DOMHTMLTableElement setAlign:]):
  +        (-[DOMHTMLTableElement bgColor]):
  +        (-[DOMHTMLTableElement setBgColor:]):
  +        (-[DOMHTMLTableElement border]):
  +        (-[DOMHTMLTableElement setBorder:]):
  +        (-[DOMHTMLTableElement cellPadding]):
  +        (-[DOMHTMLTableElement setCellPadding:]):
  +        (-[DOMHTMLTableElement cellSpacing]):
  +        (-[DOMHTMLTableElement setCellSpacing:]):
  +        (-[DOMHTMLTableElement frameBorders]):
  +        (-[DOMHTMLTableElement setFrameBorders:]):
  +        (-[DOMHTMLTableElement rules]):
  +        (-[DOMHTMLTableElement setRules:]):
  +        (-[DOMHTMLTableElement summary]):
  +        (-[DOMHTMLTableElement setSummary:]):
  +        (-[DOMHTMLTableElement width]):
  +        (-[DOMHTMLTableElement setWidth:]):
  +        (-[DOMHTMLTableColElement align]):
  +        (-[DOMHTMLTableColElement setAlign:]):
  +        (-[DOMHTMLTableColElement ch]):
  +        (-[DOMHTMLTableColElement setCh:]):
  +        (-[DOMHTMLTableColElement chOff]):
  +        (-[DOMHTMLTableColElement setChOff:]):
  +        (-[DOMHTMLTableColElement span]):
  +        (-[DOMHTMLTableColElement setSpan:]):
  +        (-[DOMHTMLTableColElement vAlign]):
  +        (-[DOMHTMLTableColElement setVAlign:]):
  +        (-[DOMHTMLTableColElement width]):
  +        (-[DOMHTMLTableColElement setWidth:]):
  +        (-[DOMHTMLTableRowElement align]):
  +        (-[DOMHTMLTableRowElement setAlign:]):
  +        (-[DOMHTMLTableRowElement bgColor]):
  +        (-[DOMHTMLTableRowElement setBgColor:]):
  +        (-[DOMHTMLTableRowElement ch]):
  +        (-[DOMHTMLTableRowElement setCh:]):
  +        (-[DOMHTMLTableRowElement chOff]):
  +        (-[DOMHTMLTableRowElement setChOff:]):
  +        (-[DOMHTMLTableRowElement vAlign]):
  +        (-[DOMHTMLTableRowElement setVAlign:]):
  +        (-[DOMHTMLTableCellElement abbr]):
  +        (-[DOMHTMLTableCellElement setAbbr:]):
  +        (-[DOMHTMLTableCellElement align]):
  +        (-[DOMHTMLTableCellElement setAlign:]):
  +        (-[DOMHTMLTableCellElement axis]):
  +        (-[DOMHTMLTableCellElement setAxis:]):
  +        (-[DOMHTMLTableCellElement bgColor]):
  +        (-[DOMHTMLTableCellElement setBgColor:]):
  +        (-[DOMHTMLTableCellElement ch]):
  +        (-[DOMHTMLTableCellElement setCh:]):
  +        (-[DOMHTMLTableCellElement chOff]):
  +        (-[DOMHTMLTableCellElement setChOff:]):
  +        (-[DOMHTMLTableCellElement colSpan]):
  +        (-[DOMHTMLTableCellElement setColSpan:]):
  +        (-[DOMHTMLTableCellElement headers]):
  +        (-[DOMHTMLTableCellElement setHeaders:]):
  +        (-[DOMHTMLTableCellElement height]):
  +        (-[DOMHTMLTableCellElement setHeight:]):
  +        (-[DOMHTMLTableCellElement noWrap]):
  +        (-[DOMHTMLTableCellElement setNoWrap:]):
  +        (-[DOMHTMLTableCellElement rowSpan]):
  +        (-[DOMHTMLTableCellElement setRowSpan:]):
  +        (-[DOMHTMLTableCellElement scope]):
  +        (-[DOMHTMLTableCellElement setScope:]):
  +        (-[DOMHTMLTableCellElement vAlign]):
  +        (-[DOMHTMLTableCellElement setVAlign:]):
  +        (-[DOMHTMLTableCellElement width]):
  +        (-[DOMHTMLTableCellElement setWidth:]):
  +        (-[DOMHTMLFrameSetElement rows]):
  +        (-[DOMHTMLFrameSetElement setRows:]):
  +        (-[DOMHTMLFrameSetElement cols]):
  +        (-[DOMHTMLFrameSetElement setCols:]):
  +        (-[DOMHTMLFrameElement frameBorder]):
  +        (-[DOMHTMLFrameElement setFrameBorder:]):
  +        (-[DOMHTMLFrameElement longDesc]):
  +        (-[DOMHTMLFrameElement setLongDesc:]):
  +        (-[DOMHTMLFrameElement marginHeight]):
  +        (-[DOMHTMLFrameElement setMarginHeight:]):
  +        (-[DOMHTMLFrameElement marginWidth]):
  +        (-[DOMHTMLFrameElement setMarginWidth:]):
  +        (-[DOMHTMLFrameElement name]):
  +        (-[DOMHTMLFrameElement setName:]):
  +        (-[DOMHTMLFrameElement noResize]):
  +        (-[DOMHTMLFrameElement setNoResize:]):
  +        (-[DOMHTMLFrameElement scrolling]):
  +        (-[DOMHTMLFrameElement setScrolling:]):
  +        (-[DOMHTMLFrameElement src]):
  +        (-[DOMHTMLFrameElement setSrc:]):
  +        (-[DOMHTMLIFrameElement align]):
  +        (-[DOMHTMLIFrameElement setAlign:]):
  +        (-[DOMHTMLIFrameElement frameBorder]):
  +        (-[DOMHTMLIFrameElement setFrameBorder:]):
  +        (-[DOMHTMLIFrameElement height]):
  +        (-[DOMHTMLIFrameElement setHeight:]):
  +        (-[DOMHTMLIFrameElement longDesc]):
  +        (-[DOMHTMLIFrameElement setLongDesc:]):
  +        (-[DOMHTMLIFrameElement marginHeight]):
  +        (-[DOMHTMLIFrameElement setMarginHeight:]):
  +        (-[DOMHTMLIFrameElement marginWidth]):
  +        (-[DOMHTMLIFrameElement setMarginWidth:]):
  +        (-[DOMHTMLIFrameElement name]):
  +        (-[DOMHTMLIFrameElement setName:]):
  +        (-[DOMHTMLIFrameElement noResize]):
  +        (-[DOMHTMLIFrameElement setNoResize:]):
  +        (-[DOMHTMLIFrameElement scrolling]):
  +        (-[DOMHTMLIFrameElement setScrolling:]):
  +        (-[DOMHTMLIFrameElement src]):
  +        (-[DOMHTMLIFrameElement setSrc:]):
  +        (-[DOMHTMLIFrameElement width]):
  +        (-[DOMHTMLIFrameElement setWidth:]):
  +        (-[DOMHTMLEmbedElement align]):
  +        (-[DOMHTMLEmbedElement setAlign:]):
  +        (-[DOMHTMLEmbedElement height]):
  +        (-[DOMHTMLEmbedElement setHeight:]):
  +        (-[DOMHTMLEmbedElement name]):
  +        (-[DOMHTMLEmbedElement setName:]):
  +        (-[DOMHTMLEmbedElement src]):
  +        (-[DOMHTMLEmbedElement setSrc:]):
  +        (-[DOMHTMLEmbedElement type]):
  +        (-[DOMHTMLEmbedElement setType:]):
  +        (-[DOMHTMLEmbedElement width]):
  +        (-[DOMHTMLEmbedElement setWidth:]):
  +        * kwq/KWQAccObject.mm:
  +        (-[KWQAccObject helpText]):
  +        (-[KWQAccObject accessibilityDescription]):
  +        (-[KWQAccObject accessibilityAttributeValue:]):
  +        * kwq/KWQKHTMLPart.mm:
  +        (KWQKHTMLPart::matchLabelsAgainstElement):
  +        (KWQKHTMLPart::fileWrapperForElement):
  +        (KWQKHTMLPart::attributedString):
  +        (KWQKHTMLPart::styleForSelectionStart):
  +        * kwq/WebCoreBridge.mm:
  +        (-[WebCoreBridge elementAtPoint:]):
  +
   2005-07-18  David Harrison  <harrison at apple.com>
   
           Reviewed by Justin.
  
  
  
  1.570     +197 -18509WebCore/WebCore.pbproj/project.pbxproj
  
  Index: project.pbxproj
  ===================================================================
  RCS file: /cvs/root/WebCore/WebCore.pbproj/project.pbxproj,v
  retrieving revision 1.569
  retrieving revision 1.570
  diff -u -r1.569 -r1.570
  --- project.pbxproj	12 Jul 2005 16:28:55 -0000	1.569
  +++ project.pbxproj	18 Jul 2005 21:44:11 -0000	1.570
  @@ -93,9 +93,6 @@
   			children = (
   				F523D16302DE42AE018635CA,
   				F58785E802DE377601EA4122,
  -				A8212D0F08794AB300677359,
  -				A8212D8208794AB500677359,
  -				A821309508794AC100677359,
   				F58785E902DE378A01EA4122,
   				089C1665FE841158C02AAC07,
   				0867D69AFE84028FC02AAC07,
  @@ -1921,42 +1918,6 @@
   			shellPath = /bin/sh;
   			shellScript = "\"$CREATE_HASH_TABLE\" khtml/ecma/xmlserializer.cpp > \"$DERIVED_FILE_DIR/xmlserializer.lut.h\"";
   		};
  -		932FC1C00824ABB9005B3C75 = {
  -			buildActionMask = 2147483647;
  -			files = (
  -			);
  -			inputPaths = (
  -				khtml/misc/maketags,
  -				khtml/misc/htmltags.in,
  -			);
  -			isa = PBXShellScriptBuildPhase;
  -			name = htmltags.c/h;
  -			outputPaths = (
  -				"$(DERIVED_FILE_DIR)/htmltags.c",
  -				"$(DERIVED_FILE_DIR)/htmltags.h",
  -			);
  -			runOnlyForDeploymentPostprocessing = 0;
  -			shellPath = /bin/sh;
  -			shellScript = "cat khtml/misc/htmltags.in > \"$DERIVED_FILE_DIR/htmltags.in\"\ncd \"$DERIVED_FILE_DIR\"\nperl \"$SRCROOT/khtml/misc/maketags\"";
  -		};
  -		932FC2950824B345005B3C75 = {
  -			buildActionMask = 2147483647;
  -			files = (
  -			);
  -			inputPaths = (
  -				khtml/misc/makeattrs,
  -				khtml/misc/htmlattrs.in,
  -			);
  -			isa = PBXShellScriptBuildPhase;
  -			name = htmlattrs.c/h;
  -			outputPaths = (
  -				"$(DERIVED_FILE_DIR)/htmlattrs.c",
  -				"$(DERIVED_FILE_DIR)/htmlattrs.h",
  -			);
  -			runOnlyForDeploymentPostprocessing = 0;
  -			shellPath = /bin/sh;
  -			shellScript = "cat khtml/misc/htmlattrs.in > \"$DERIVED_FILE_DIR/htmlattrs.in\"\ncd \"$DERIVED_FILE_DIR\"\nperl \"$SRCROOT/khtml/misc/makeattrs\"";
  -		};
   		932FC2BC0824B422005B3C75 = {
   			buildActionMask = 2147483647;
   			files = (
  @@ -2356,8 +2317,6 @@
   				932FC2C70824B485005B3C75,
   				932FC2BC0824B422005B3C75,
   				932FC0B70824A175005B3C75,
  -				932FC2950824B345005B3C75,
  -				932FC1C00824ABB9005B3C75,
   				93EA686C08249AF400687F56,
   				932FC10B0824A4D4005B3C75,
   				932FC1610824A8E3005B3C75,
  @@ -2486,7 +2445,6 @@
   				93F198F508245E59001E9ABC,
   				93F198F608245E59001E9ABC,
   				93F198F708245E59001E9ABC,
  -				93F198F908245E59001E9ABC,
   				93F198FB08245E59001E9ABC,
   				93F198FC08245E59001E9ABC,
   				93F198FD08245E59001E9ABC,
  @@ -3147,12 +3105,6 @@
   			settings = {
   			};
   		};
  -		93F198F908245E59001E9ABC = {
  -			fileRef = F523D27F02DE43D7018635CA;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
   		93F198FB08245E59001E9ABC = {
   			fileRef = F523D28202DE43D7018635CA;
   			isa = PBXBuildFile;
  @@ -4989,7 +4941,6 @@
   				93F19A9C08245E59001E9ABC,
   				93F19A9D08245E59001E9ABC,
   				93F19A9E08245E59001E9ABC,
  -				93F19A9F08245E59001E9ABC,
   				93F19AA008245E59001E9ABC,
   				93F19AA108245E59001E9ABC,
   				93F19AA208245E59001E9ABC,
  @@ -5868,12 +5819,6 @@
   			settings = {
   			};
   		};
  -		93F19A9F08245E59001E9ABC = {
  -			fileRef = F523D27E02DE43D7018635CA;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
   		93F19AA008245E59001E9ABC = {
   			fileRef = F523D28502DE43D7018635CA;
   			isa = PBXBuildFile;
  @@ -7160,7 +7105,6 @@
   				A8212AC208794A2300677359,
   				A8212AC308794A2300677359,
   				A8212AC408794A2300677359,
  -				A8212AC508794A2300677359,
   				A8212AC608794A2300677359,
   				A8212AC708794A2300677359,
   				A8212AC808794A2300677359,
  @@ -7447,575 +7391,7 @@
   				A8212BE008794A2300677359,
   				A8212BE108794A2300677359,
   				A8212BE208794A2300677359,
  -				A821416808794AF700677359,
  -				A821416D08794AF700677359,
  -				A821416E08794AF700677359,
  -				A821417008794AF700677359,
  -				A821417208794AF700677359,
  -				A821417408794AF700677359,
  -				A821417608794AF700677359,
  -				A821417808794AF700677359,
  -				A821417A08794AF700677359,
  -				A821417C08794AF700677359,
  -				A821417E08794AF700677359,
  -				A821418008794AF700677359,
  -				A821418208794AF700677359,
  -				A821418408794AF700677359,
  -				A821418708794AF700677359,
  -				A821418908794AF700677359,
  -				A821418C08794AF700677359,
  -				A821418E08794AF700677359,
  -				A821419008794AF700677359,
  -				A821419208794AF700677359,
  -				A821419408794AF700677359,
  -				A821419608794AF700677359,
  -				A821419808794AF700677359,
  -				A821419908794AF700677359,
  -				A821419B08794AF700677359,
  -				A821419C08794AF700677359,
  -				A821419E08794AF700677359,
  -				A821419F08794AF700677359,
  -				A82141A108794AF700677359,
  -				A82141AD08794AF700677359,
  -				A82141B108794AF700677359,
  -				A82141BF08794AF700677359,
  -				A82141C108794AF700677359,
  -				A82141C308794AF700677359,
  -				A82141C508794AF700677359,
  -				A82141C708794AF700677359,
  -				A82141CA08794AF700677359,
  -				A82141CB08794AF700677359,
  -				A82141CD08794AF700677359,
  -				A82141CF08794AF700677359,
  -				A82141D008794AF700677359,
  -				A82141D508794AF700677359,
  -				A821421208794AF700677359,
  -				A821421408794AF700677359,
  -				A821421608794AF700677359,
  -				A821421908794AF700677359,
  -				A821421B08794AF800677359,
  -				A821421D08794AF800677359,
  -				A821421E08794AF800677359,
  -				A821422008794AF800677359,
  -				A821422208794AF800677359,
  -				A821422408794AF800677359,
  -				A821422608794AF800677359,
  -				A821422808794AF800677359,
  -				A821422A08794AF800677359,
  -				A821422C08794AF800677359,
  -				A821422E08794AF800677359,
  -				A821423008794AF800677359,
  -				A821423208794AF800677359,
  -				A821423408794AF800677359,
  -				A821423608794AF800677359,
  -				A821423808794AF800677359,
  -				A821423A08794AF800677359,
  -				A821423C08794AF800677359,
  -				A821423E08794AF800677359,
  -				A821424008794AF800677359,
  -				A821424208794AF800677359,
  -				A821424408794AF800677359,
  -				A821424608794AF800677359,
  -				A821424808794AF800677359,
  -				A821424A08794AF800677359,
  -				A821424C08794AF800677359,
  -				A821424E08794AF800677359,
  -				A821425108794AF800677359,
  -				A821425308794AF800677359,
  -				A821425508794AF800677359,
  -				A821425708794AF800677359,
  -				A821425908794AF800677359,
  -				A821425B08794AF800677359,
  -				A821425D08794AF800677359,
  -				A821425F08794AF800677359,
  -				A821426108794AF800677359,
  -				A821426408794AF800677359,
  -				A821426608794AF800677359,
  -				A821426A08794AF800677359,
  -				A821426C08794AF800677359,
  -				A821426E08794AF800677359,
  -				A821427008794AF800677359,
  -				A821427208794AF800677359,
  -				A821427408794AF800677359,
  -				A821427608794AF800677359,
  -				A821427808794AF800677359,
  -				A821427A08794AF800677359,
  -				A821427C08794AF800677359,
  -				A821427F08794AF800677359,
  -				A821428108794AF800677359,
  -				A821428308794AF800677359,
  -				A821428508794AF800677359,
  -				A821428708794AF800677359,
  -				A821428908794AF800677359,
  -				A821428A08794AF800677359,
  -				A821428B08794AF800677359,
  -				A821428C08794AF800677359,
  -				A821428D08794AF800677359,
  -				A821428F08794AF800677359,
  -				A821429108794AF800677359,
  -				A821429208794AF800677359,
  -				A821429308794AF800677359,
  -				A821429408794AF800677359,
  -				A821429C08794AF800677359,
  -				A821429E08794AF800677359,
  -				A82142A008794AF800677359,
  -				A82142A208794AF800677359,
  -				A82142A408794AF800677359,
  -				A82142A608794AF800677359,
  -				A82142A808794AF800677359,
  -				A82142AA08794AF800677359,
  -				A82142AC08794AF800677359,
  -				A82142AE08794AF800677359,
  -				A82142B008794AF800677359,
  -				A82142B208794AF800677359,
  -				A82142B408794AF800677359,
  -				A82142B608794AF800677359,
  -				A82142B708794AF800677359,
  -				A82142B808794AF800677359,
  -				A82142BA08794AF800677359,
  -				A82142BB08794AF800677359,
  -				A82142BD08794AF800677359,
  -				A82142C208794AF800677359,
  -				A82142C408794AF800677359,
  -				A82142C608794AF800677359,
  -				A82142C808794AF800677359,
  -				A82142CA08794AF800677359,
  -				A82142CC08794AF800677359,
  -				A82142CE08794AF800677359,
  -				A82142D008794AF800677359,
  -				A82142D208794AF800677359,
  -				A82142D408794AF800677359,
  -				A82142D608794AF800677359,
  -				A82142D808794AF800677359,
  -				A82142DA08794AF800677359,
  -				A82142DC08794AF800677359,
  -				A82142DE08794AF800677359,
  -				A82142E108794AF800677359,
  -				A82142E308794AF800677359,
  -				A82142E508794AF800677359,
  -				A82142E708794AF800677359,
  -				A82142E808794AF800677359,
  -				A82142EA08794AF800677359,
  -				A82142ED08794AF800677359,
  -				A82142EF08794AF800677359,
  -				A82142F108794AF800677359,
  -				A82142F308794AF800677359,
  -				A82142F508794AF800677359,
  -				A82142F708794AF800677359,
  -				A82142F908794AF800677359,
  -				A82142FB08794AF800677359,
  -				A82142FD08794AF800677359,
  -				A82142FF08794AF800677359,
  -				A821430108794AF800677359,
  -				A821430308794AF800677359,
  -				A821430508794AF800677359,
  -				A821430808794AF800677359,
  -				A821430A08794AF800677359,
  -				A821430C08794AF800677359,
  -				A821430E08794AF800677359,
  -				A821431008794AF800677359,
  -				A821431108794AF800677359,
  -				A821431308794AF800677359,
  -				A821431508794AF800677359,
  -				A821431708794AF800677359,
  -				A821431908794AF800677359,
  -				A821431B08794AF800677359,
  -				A821431D08794AF800677359,
  -				A821431F08794AF900677359,
  -				A821432208794AF900677359,
  -				A821432408794AF900677359,
  -				A821432608794AF900677359,
  -				A821432A08794AF900677359,
  -				A821432C08794AF900677359,
  -				A821432E08794AF900677359,
  -				A821433008794AF900677359,
  -				A821433208794AF900677359,
  -				A821433408794AF900677359,
  -				A821433608794AF900677359,
  -				A821433808794AF900677359,
  -				A821433A08794AF900677359,
  -				A821433C08794AF900677359,
  -				A821433E08794AF900677359,
  -				A821434708794AF900677359,
  -				A821434908794AF900677359,
  -				A821434B08794AF900677359,
  -				A821434D08794AF900677359,
  -				A821434F08794AF900677359,
  -				A821435108794AF900677359,
  -				A821435308794AF900677359,
  -				A821435508794AF900677359,
  -				A821435708794AF900677359,
  -				A821435908794AF900677359,
  -				A821435B08794AF900677359,
  -				A821435D08794AF900677359,
  -				A821435F08794AF900677359,
  -				A821436108794AF900677359,
  -				A821436308794AF900677359,
  -				A821436508794AF900677359,
  -				A821436708794AF900677359,
  -				A821436908794AF900677359,
  -				A821436D08794AF900677359,
  -				A821436E08794AF900677359,
  -				A821437008794AF900677359,
  -				A821437208794AF900677359,
  -				A821437408794AF900677359,
  -				A821437808794AF900677359,
  -				A821437B08794AF900677359,
  -				A821438108794AF900677359,
  -				A821438308794AF900677359,
  -				A821438508794AF900677359,
  -				A821438808794AF900677359,
  -				A821438A08794AF900677359,
  -				A821438B08794AF900677359,
  -				A821438E08794AF900677359,
  -				A821439008794AF900677359,
  -				A82143A108794AF900677359,
  -				A82143B808794AF900677359,
  -				A82143BB08794AF900677359,
  -				A82143BD08794AF900677359,
  -				A82143C008794AF900677359,
  -				A82143C208794AF900677359,
  -				A82143C408794AF900677359,
  -				A82143C608794AF900677359,
  -				A82143C708794AF900677359,
  -				A82143CA08794AF900677359,
  -				A82143CC08794AF900677359,
  -				A82143CE08794AF900677359,
  -				A82143CF08794AF900677359,
  -				A82143D108794AF900677359,
  -				A82143D308794AF900677359,
  -				A82143D508794AF900677359,
  -				A82143D708794AF900677359,
  -				A82143D908794AF900677359,
  -				A82143F608794AF900677359,
  -				A82143F808794AF900677359,
  -				A82143FA08794AF900677359,
  -				A82143FD08794AF900677359,
  -				A82143FF08794AF900677359,
  -				A821440108794AF900677359,
  -				A821440308794AF900677359,
  -				A821440508794AF900677359,
  -				A821440808794AF900677359,
  -				A821440A08794AF900677359,
  -				A821440C08794AF900677359,
  -				A821440E08794AF900677359,
  -				A821441008794AF900677359,
  -				A821441208794AF900677359,
  -				A821441408794AF900677359,
  -				A821441708794AF900677359,
  -				A821441908794AF900677359,
  -				A821441B08794AF900677359,
  -				A821441E08794AF900677359,
  -				A821442008794AFA00677359,
  -				A821442208794AFA00677359,
  -				A821442408794AFA00677359,
  -				A821442608794AFA00677359,
  -				A821442808794AFA00677359,
  -				A821442A08794AFA00677359,
  -				A821442D08794AFA00677359,
  -				A821442F08794AFA00677359,
  -				A821443208794AFA00677359,
  -				A821443408794AFA00677359,
  -				A821443908794AFA00677359,
  -				A821443C08794AFA00677359,
  -				A821443E08794AFA00677359,
  -				A821444108794AFA00677359,
  -				A821444308794AFA00677359,
  -				A821444508794AFA00677359,
  -				A821444708794AFA00677359,
  -				A821444908794AFA00677359,
  -				A821444B08794AFA00677359,
  -				A821444D08794AFA00677359,
  -				A821445308794AFA00677359,
  -				A821445508794AFA00677359,
  -				A821445708794AFA00677359,
  -				A821445908794AFA00677359,
  -				A821445A08794AFA00677359,
  -				A821445E08794AFA00677359,
  -				A821446008794AFA00677359,
  -				A821446208794AFA00677359,
  -				A821446408794AFA00677359,
  -				A821446608794AFA00677359,
  -				A821446808794AFA00677359,
  -				A821446A08794AFA00677359,
  -				A821446D08794AFA00677359,
  -				A821446F08794AFA00677359,
  -				A821447108794AFA00677359,
  -				A821447308794AFA00677359,
  -				A821447508794AFA00677359,
  -				A821447708794AFA00677359,
  -				A821447908794AFA00677359,
  -				A821447B08794AFA00677359,
  -				A821447D08794AFA00677359,
  -				A821447F08794AFA00677359,
  -				A821448008794AFA00677359,
  -				A821448608794AFA00677359,
  -				A821448808794AFA00677359,
  -				A821448A08794AFA00677359,
  -				A821448C08794AFA00677359,
  -				A821448E08794AFA00677359,
  -				A821449008794AFA00677359,
  -				A821449208794AFA00677359,
  -				A821449408794AFA00677359,
  -				A821449908794AFA00677359,
  -				A821449F08794AFA00677359,
  -				A82144A108794AFA00677359,
  -				A82144A308794AFA00677359,
  -				A82144A508794AFA00677359,
  -				A82144A708794AFA00677359,
  -				A82144A908794AFA00677359,
  -				A82144AA08794AFA00677359,
  -				A82144AB08794AFA00677359,
  -				A82144AE08794AFA00677359,
  -				A82144B108794AFA00677359,
  -				A82144B308794AFA00677359,
  -				A82144B508794AFA00677359,
  -				A82144B708794AFA00677359,
  -				A82144B908794AFA00677359,
  -				A82144BB08794AFA00677359,
  -				A82144BD08794AFA00677359,
  -				A82144BF08794AFA00677359,
  -				A82144C108794AFA00677359,
  -				A82144C308794AFA00677359,
  -				A82144C508794AFA00677359,
  -				A82144C708794AFA00677359,
  -				A82144C908794AFA00677359,
  -				A82144CB08794AFA00677359,
  -				A82144CD08794AFA00677359,
  -				A82144CF08794AFA00677359,
  -				A82144D108794AFA00677359,
  -				A82144D308794AFA00677359,
  -				A82144D508794AFA00677359,
  -				A82144D708794AFA00677359,
  -				A82144D908794AFA00677359,
  -				A82144DB08794AFA00677359,
  -				A82144DD08794AFA00677359,
  -				A82144DF08794AFA00677359,
  -				A82144E108794AFA00677359,
  -				A82144E308794AFA00677359,
  -				A82144E508794AFA00677359,
  -				A82144E708794AFA00677359,
  -				A82144E908794AFA00677359,
  -				A82144EB08794AFA00677359,
  -				A82144ED08794AFA00677359,
  -				A82144EF08794AFA00677359,
  -				A82144F108794AFA00677359,
  -				A82144F308794AFA00677359,
  -				A82144F508794AFA00677359,
  -				A82144F708794AFA00677359,
  -				A82144F908794AFA00677359,
  -				A82144FB08794AFA00677359,
  -				A82144FD08794AFA00677359,
  -				A82144FF08794AFA00677359,
  -				A821450108794AFA00677359,
  -				A821450308794AFA00677359,
  -				A821450508794AFA00677359,
  -				A821450708794AFA00677359,
  -				A821450908794AFA00677359,
  -				A821450B08794AFA00677359,
  -				A821450D08794AFA00677359,
  -				A821450F08794AFA00677359,
  -				A821451108794AFA00677359,
  -				A821451308794AFA00677359,
  -				A821451508794AFA00677359,
  -				A821451708794AFA00677359,
  -				A821451908794AFA00677359,
  -				A821451B08794AFB00677359,
  -				A821451D08794AFB00677359,
  -				A821451F08794AFB00677359,
  -				A821452108794AFB00677359,
  -				A821452308794AFB00677359,
  -				A821452508794AFB00677359,
  -				A821452708794AFB00677359,
  -				A821452908794AFB00677359,
  -				A821452B08794AFB00677359,
  -				A821452D08794AFB00677359,
  -				A821452F08794AFB00677359,
  -				A821453108794AFB00677359,
  -				A821453308794AFB00677359,
  -				A821453508794AFB00677359,
  -				A821453708794AFB00677359,
  -				A821453908794AFB00677359,
  -				A821453B08794AFB00677359,
  -				A821453D08794AFB00677359,
  -				A821453F08794AFB00677359,
  -				A821454108794AFB00677359,
  -				A821454308794AFB00677359,
  -				A821454508794AFB00677359,
  -				A821454708794AFB00677359,
  -				A821454908794AFB00677359,
  -				A821454B08794AFB00677359,
  -				A821454D08794AFB00677359,
  -				A821454F08794AFB00677359,
  -				A821455108794AFB00677359,
  -				A821455308794AFB00677359,
  -				A821455508794AFB00677359,
  -				A821455708794AFB00677359,
  -				A821455908794AFB00677359,
  -				A821455B08794AFB00677359,
  -				A821455D08794AFB00677359,
  -				A821455F08794AFB00677359,
  -				A821456108794AFB00677359,
  -				A821456308794AFB00677359,
  -				A821456508794AFB00677359,
  -				A821456708794AFB00677359,
  -				A821456908794AFB00677359,
  -				A821456B08794AFB00677359,
  -				A821456D08794AFB00677359,
  -				A821456F08794AFB00677359,
  -				A821457108794AFB00677359,
  -				A821457308794AFB00677359,
  -				A821457508794AFB00677359,
  -				A821457708794AFB00677359,
  -				A821457908794AFB00677359,
  -				A821457B08794AFB00677359,
  -				A821457D08794AFB00677359,
  -				A821457F08794AFB00677359,
  -				A821458108794AFB00677359,
  -				A821458308794AFB00677359,
  -				A821458508794AFB00677359,
  -				A821458708794AFB00677359,
  -				A821458908794AFB00677359,
  -				A821458B08794AFB00677359,
  -				A821458D08794AFB00677359,
  -				A821458F08794AFB00677359,
  -				A821459108794AFB00677359,
  -				A821459208794AFB00677359,
  -				A821459408794AFB00677359,
  -				A821459608794AFB00677359,
  -				A821459908794AFB00677359,
  -				A821459B08794AFB00677359,
  -				A821459C08794AFB00677359,
  -				A821459F08794AFB00677359,
  -				A82145A108794AFB00677359,
  -				A82145A308794AFB00677359,
  -				A82145A608794AFB00677359,
  -				A82145A808794AFB00677359,
  -				A82145AA08794AFB00677359,
  -				A82145AC08794AFB00677359,
  -				A82145AE08794AFB00677359,
  -				A82145B008794AFB00677359,
  -				A82145B208794AFB00677359,
  -				A82145B408794AFB00677359,
  -				A82145B608794AFB00677359,
  -				A82145B808794AFB00677359,
  -				A82145BA08794AFB00677359,
  -				A82145BC08794AFB00677359,
  -				A82145BE08794AFB00677359,
  -				A82145C008794AFB00677359,
  -				A82145C208794AFB00677359,
  -				A82145C408794AFB00677359,
  -				A82145C508794AFB00677359,
  -				A82145C708794AFB00677359,
  -				A82145C908794AFC00677359,
  -				A82145CB08794AFC00677359,
  -				A82145CD08794AFC00677359,
  -				A82145CF08794AFC00677359,
  -				A82145D208794AFC00677359,
  -				A82145D408794AFC00677359,
  -				A82145D608794AFC00677359,
  -				A82145D808794AFC00677359,
  -				A82145DA08794AFC00677359,
  -				A82145DC08794AFC00677359,
  -				A82145DE08794AFC00677359,
  -				A82145E008794AFC00677359,
  -				A82145E208794AFC00677359,
  -				A82145E408794AFC00677359,
  -				A82145E608794AFC00677359,
  -				A82145E808794AFC00677359,
  -				A82145EA08794AFC00677359,
  -				A82145EC08794AFC00677359,
  -				A82145EE08794AFC00677359,
  -				A82145F008794AFC00677359,
  -				A82145F208794AFC00677359,
  -				A82145F408794AFC00677359,
  -				A82145F608794AFC00677359,
  -				A82145F808794AFC00677359,
  -				A82145FA08794AFC00677359,
  -				A82145FC08794AFC00677359,
  -				A82145FE08794AFC00677359,
  -				A821460008794AFC00677359,
  -				A821460208794AFC00677359,
  -				A821460408794AFC00677359,
  -				A821460608794AFC00677359,
  -				A821460808794AFC00677359,
  -				A821460A08794AFC00677359,
  -				A821460C08794AFC00677359,
  -				A821460E08794AFC00677359,
  -				A821461008794AFC00677359,
  -				A821461208794AFC00677359,
  -				A821461408794AFC00677359,
  -				A821461608794AFC00677359,
  -				A821461808794AFC00677359,
  -				A821461A08794AFC00677359,
  -				A821461C08794AFC00677359,
  -				A821461E08794AFC00677359,
  -				A821462008794AFC00677359,
  -				A821462208794AFC00677359,
  -				A821462408794AFC00677359,
  -				A821462508794AFC00677359,
  -				A821462708794AFC00677359,
  -				A821462908794AFC00677359,
  -				A821462B08794AFC00677359,
  -				A821462D08794AFC00677359,
  -				A821462F08794AFC00677359,
  -				A821463108794AFC00677359,
  -				A821463308794AFC00677359,
  -				A821463508794AFC00677359,
  -				A821463708794AFC00677359,
  -				A821463908794AFD00677359,
  -				A821463B08794AFD00677359,
  -				A821463D08794AFD00677359,
  -				A821463F08794AFD00677359,
  -				A821464108794AFD00677359,
  -				A821464308794AFD00677359,
  -				A821464508794AFD00677359,
  -				A821464708794AFD00677359,
  -				A821464908794AFD00677359,
  -				A821464B08794AFD00677359,
  -				A821464D08794AFD00677359,
  -				A821464F08794AFD00677359,
  -				A821465108794AFD00677359,
  -				A821465308794AFD00677359,
  -				A821465508794AFD00677359,
  -				A821465708794AFD00677359,
  -				A821465908794AFD00677359,
  -				A821465B08794AFD00677359,
  -				A821465D08794AFD00677359,
  -				A821465F08794AFD00677359,
  -				A821466108794AFD00677359,
  -				A821466308794AFD00677359,
  -				A821466508794AFD00677359,
  -				A821466708794AFD00677359,
  -				A821466908794AFD00677359,
  -				A821466B08794AFD00677359,
  -				A821466D08794AFD00677359,
  -				A821466F08794AFD00677359,
  -				A821467108794AFD00677359,
  -				A821467308794AFD00677359,
  -				A821467508794AFD00677359,
  -				A821467708794AFD00677359,
  -				A821467A08794AFD00677359,
  -				A821467C08794AFD00677359,
  -				A821467E08794AFD00677359,
  -				A821468008794AFD00677359,
  -				A821468208794AFD00677359,
  -				A821468408794AFD00677359,
  -				A821468608794AFD00677359,
  -				A821468808794AFD00677359,
  -				A821468A08794AFD00677359,
  -				A821468C08794AFD00677359,
  -				A821468E08794AFD00677359,
  -				A821469008794AFD00677359,
  -				A821469208794AFD00677359,
  -				A821469308794AFD00677359,
  -				A821469708794AFD00677359,
  -				A821469808794AFD00677359,
  -				A821469908794AFD00677359,
  -				A821469B08794AFD00677359,
   				A85D7A8F0879EC64006A9172,
  -				A85D7AAD087A0C60006A9172,
  -				A85D7BA5087A6621006A9172,
   				A898F147088121E90075EFB2,
   			);
   			isa = PBXHeadersBuildPhase;
  @@ -8387,12 +7763,6 @@
   			settings = {
   			};
   		};
  -		A8212AC508794A2300677359 = {
  -			fileRef = F523D27F02DE43D7018635CA;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
   		A8212AC608794A2300677359 = {
   			fileRef = F523D28202DE43D7018635CA;
   			isa = PBXBuildFile;
  @@ -10207,14 +9577,6 @@
   				A8212BF008794A2300677359,
   				A8212BF108794A2300677359,
   				A8212BF208794A2300677359,
  -				A821424F08794AF800677359,
  -				A821426208794AF800677359,
  -				A821430608794AF800677359,
  -				A821449A08794AFA00677359,
  -				A821449B08794AFA00677359,
  -				A821449D08794AFA00677359,
  -				A82145D008794AFC00677359,
  -				A821467808794AFD00677359,
   			);
   			isa = PBXResourcesBuildPhase;
   			runOnlyForDeploymentPostprocessing = 0;
  @@ -10435,7 +9797,6 @@
   				A8212C6D08794A2300677359,
   				A8212C6E08794A2300677359,
   				A8212C6F08794A2300677359,
  -				A8212C7008794A2300677359,
   				A8212C7108794A2300677359,
   				A8212C7208794A2300677359,
   				A8212C7308794A2300677359,
  @@ -10576,532 +9937,7 @@
   				A8212CFC08794A2300677359,
   				A8212CFD08794A2300677359,
   				A8212CFE08794A2300677359,
  -				A821416608794AF700677359,
  -				A821416C08794AF700677359,
  -				A821416F08794AF700677359,
  -				A821417108794AF700677359,
  -				A821417308794AF700677359,
  -				A821417508794AF700677359,
  -				A821417708794AF700677359,
  -				A821417908794AF700677359,
  -				A821417D08794AF700677359,
  -				A821417F08794AF700677359,
  -				A821418108794AF700677359,
  -				A821418508794AF700677359,
  -				A821418608794AF700677359,
  -				A821418808794AF700677359,
  -				A821418A08794AF700677359,
  -				A821418B08794AF700677359,
  -				A821418D08794AF700677359,
  -				A821418F08794AF700677359,
  -				A821419108794AF700677359,
  -				A821419308794AF700677359,
  -				A821419508794AF700677359,
  -				A821419708794AF700677359,
  -				A821419A08794AF700677359,
  -				A821419D08794AF700677359,
  -				A82141A008794AF700677359,
  -				A82141AC08794AF700677359,
  -				A82141B008794AF700677359,
  -				A82141C208794AF700677359,
  -				A82141C408794AF700677359,
  -				A82141C908794AF700677359,
  -				A82141CC08794AF700677359,
  -				A82141CE08794AF700677359,
  -				A82141D408794AF700677359,
  -				A821421108794AF700677359,
  -				A821421308794AF700677359,
  -				A821421508794AF700677359,
  -				A821421808794AF700677359,
  -				A821421A08794AF800677359,
  -				A821421C08794AF800677359,
  -				A821421F08794AF800677359,
  -				A821422108794AF800677359,
  -				A821422308794AF800677359,
  -				A821422508794AF800677359,
  -				A821422708794AF800677359,
  -				A821422908794AF800677359,
  -				A821422B08794AF800677359,
  -				A821422D08794AF800677359,
  -				A821422F08794AF800677359,
  -				A821423108794AF800677359,
  -				A821423308794AF800677359,
  -				A821423508794AF800677359,
  -				A821423708794AF800677359,
  -				A821423908794AF800677359,
  -				A821423B08794AF800677359,
  -				A821423D08794AF800677359,
  -				A821423F08794AF800677359,
  -				A821424108794AF800677359,
  -				A821424308794AF800677359,
  -				A821424508794AF800677359,
  -				A821424708794AF800677359,
  -				A821424908794AF800677359,
  -				A821424B08794AF800677359,
  -				A821424D08794AF800677359,
  -				A821425008794AF800677359,
  -				A821425208794AF800677359,
  -				A821425408794AF800677359,
  -				A821425608794AF800677359,
  -				A821425808794AF800677359,
  -				A821425A08794AF800677359,
  -				A821425C08794AF800677359,
  -				A821425E08794AF800677359,
  -				A821426008794AF800677359,
  -				A821426308794AF800677359,
  -				A821426508794AF800677359,
  -				A821426708794AF800677359,
  -				A821426908794AF800677359,
  -				A821426B08794AF800677359,
  -				A821426D08794AF800677359,
  -				A821426F08794AF800677359,
  -				A821427108794AF800677359,
  -				A821427308794AF800677359,
  -				A821427508794AF800677359,
  -				A821427708794AF800677359,
  -				A821427B08794AF800677359,
  -				A821427E08794AF800677359,
  -				A821428008794AF800677359,
  -				A821428208794AF800677359,
  -				A821428408794AF800677359,
  -				A821428608794AF800677359,
  -				A821428808794AF800677359,
  -				A821428E08794AF800677359,
  -				A821429B08794AF800677359,
  -				A821429D08794AF800677359,
  -				A821429F08794AF800677359,
  -				A82142A108794AF800677359,
  -				A82142A308794AF800677359,
  -				A82142A508794AF800677359,
  -				A82142A708794AF800677359,
  -				A82142A908794AF800677359,
  -				A82142AB08794AF800677359,
  -				A82142AD08794AF800677359,
  -				A82142AF08794AF800677359,
  -				A82142B108794AF800677359,
  -				A82142B308794AF800677359,
  -				A82142B508794AF800677359,
  -				A82142B908794AF800677359,
  -				A82142BC08794AF800677359,
  -				A82142C108794AF800677359,
  -				A82142C308794AF800677359,
  -				A82142C508794AF800677359,
  -				A82142C708794AF800677359,
  -				A82142C908794AF800677359,
  -				A82142CB08794AF800677359,
  -				A82142CD08794AF800677359,
  -				A82142CF08794AF800677359,
  -				A82142D108794AF800677359,
  -				A82142D308794AF800677359,
  -				A82142D508794AF800677359,
  -				A82142D708794AF800677359,
  -				A82142D908794AF800677359,
  -				A82142DB08794AF800677359,
  -				A82142DD08794AF800677359,
  -				A82142E008794AF800677359,
  -				A82142E208794AF800677359,
  -				A82142E408794AF800677359,
  -				A82142E608794AF800677359,
  -				A82142E908794AF800677359,
  -				A82142EC08794AF800677359,
  -				A82142EE08794AF800677359,
  -				A82142F008794AF800677359,
  -				A82142F208794AF800677359,
  -				A82142F408794AF800677359,
  -				A82142F608794AF800677359,
  -				A82142F808794AF800677359,
  -				A82142FA08794AF800677359,
  -				A82142FC08794AF800677359,
  -				A82142FE08794AF800677359,
  -				A821430008794AF800677359,
  -				A821430208794AF800677359,
  -				A821430708794AF800677359,
  -				A821430908794AF800677359,
  -				A821430B08794AF800677359,
  -				A821430D08794AF800677359,
  -				A821430F08794AF800677359,
  -				A821431208794AF800677359,
  -				A821431408794AF800677359,
  -				A821431608794AF800677359,
  -				A821431808794AF800677359,
  -				A821431A08794AF800677359,
  -				A821431C08794AF800677359,
  -				A821431E08794AF800677359,
  -				A821432108794AF900677359,
  -				A821432308794AF900677359,
  -				A821432508794AF900677359,
  -				A821432908794AF900677359,
  -				A821432B08794AF900677359,
  -				A821432D08794AF900677359,
  -				A821432F08794AF900677359,
  -				A821433108794AF900677359,
  -				A821433308794AF900677359,
  -				A821433508794AF900677359,
  -				A821433908794AF900677359,
  -				A821433B08794AF900677359,
  -				A821433D08794AF900677359,
  -				A821434608794AF900677359,
  -				A821434808794AF900677359,
  -				A821434A08794AF900677359,
  -				A821434C08794AF900677359,
  -				A821434E08794AF900677359,
  -				A821435008794AF900677359,
  -				A821435208794AF900677359,
  -				A821435408794AF900677359,
  -				A821435608794AF900677359,
  -				A821435A08794AF900677359,
  -				A821435C08794AF900677359,
  -				A821435E08794AF900677359,
  -				A821436008794AF900677359,
  -				A821436208794AF900677359,
  -				A821436408794AF900677359,
  -				A821436608794AF900677359,
  -				A821436808794AF900677359,
  -				A821436C08794AF900677359,
  -				A821436F08794AF900677359,
  -				A821437108794AF900677359,
  -				A821437308794AF900677359,
  -				A821437708794AF900677359,
  -				A821437908794AF900677359,
  -				A821438008794AF900677359,
  -				A821438208794AF900677359,
  -				A821438408794AF900677359,
  -				A821438708794AF900677359,
  -				A821438908794AF900677359,
  -				A821438D08794AF900677359,
  -				A821438F08794AF900677359,
  -				A82143A008794AF900677359,
  -				A82143B708794AF900677359,
  -				A82143BA08794AF900677359,
  -				A82143BC08794AF900677359,
  -				A82143BF08794AF900677359,
  -				A82143C108794AF900677359,
  -				A82143C308794AF900677359,
  -				A82143C508794AF900677359,
  -				A82143C908794AF900677359,
  -				A82143CB08794AF900677359,
  -				A82143CD08794AF900677359,
  -				A82143D008794AF900677359,
  -				A82143D208794AF900677359,
  -				A82143D408794AF900677359,
  -				A82143D608794AF900677359,
  -				A82143D808794AF900677359,
  -				A82143F508794AF900677359,
  -				A82143F708794AF900677359,
  -				A82143F908794AF900677359,
  -				A82143FC08794AF900677359,
  -				A82143FE08794AF900677359,
  -				A821440008794AF900677359,
  -				A821440208794AF900677359,
  -				A821440408794AF900677359,
  -				A821440708794AF900677359,
  -				A821440908794AF900677359,
  -				A821440B08794AF900677359,
  -				A821440D08794AF900677359,
  -				A821440F08794AF900677359,
  -				A821441108794AF900677359,
  -				A821441308794AF900677359,
  -				A821441608794AF900677359,
  -				A821441808794AF900677359,
  -				A821441A08794AF900677359,
  -				A821441D08794AF900677359,
  -				A821441F08794AF900677359,
  -				A821442108794AFA00677359,
  -				A821442308794AFA00677359,
  -				A821442508794AFA00677359,
  -				A821442708794AFA00677359,
  -				A821442908794AFA00677359,
  -				A821442C08794AFA00677359,
  -				A821442E08794AFA00677359,
  -				A821443108794AFA00677359,
  -				A821443308794AFA00677359,
  -				A821443808794AFA00677359,
  -				A821443A08794AFA00677359,
  -				A821443B08794AFA00677359,
  -				A821443D08794AFA00677359,
  -				A821444008794AFA00677359,
  -				A821444208794AFA00677359,
  -				A821444408794AFA00677359,
  -				A821444608794AFA00677359,
  -				A821444808794AFA00677359,
  -				A821444A08794AFA00677359,
  -				A821444C08794AFA00677359,
  -				A821445208794AFA00677359,
  -				A821445408794AFA00677359,
  -				A821445608794AFA00677359,
  -				A821445808794AFA00677359,
  -				A821445D08794AFA00677359,
  -				A821445F08794AFA00677359,
  -				A821446108794AFA00677359,
  -				A821446308794AFA00677359,
  -				A821446508794AFA00677359,
  -				A821446708794AFA00677359,
  -				A821446908794AFA00677359,
  -				A821446C08794AFA00677359,
  -				A821446E08794AFA00677359,
  -				A821447008794AFA00677359,
  -				A821447208794AFA00677359,
  -				A821447408794AFA00677359,
  -				A821447608794AFA00677359,
  -				A821447808794AFA00677359,
  -				A821447A08794AFA00677359,
  -				A821447C08794AFA00677359,
  -				A821447E08794AFA00677359,
  -				A821448508794AFA00677359,
  -				A821448708794AFA00677359,
  -				A821448908794AFA00677359,
  -				A821448B08794AFA00677359,
  -				A821448D08794AFA00677359,
  -				A821448F08794AFA00677359,
  -				A821449108794AFA00677359,
  -				A821449308794AFA00677359,
  -				A821449808794AFA00677359,
  -				A821449E08794AFA00677359,
  -				A82144A008794AFA00677359,
  -				A82144A208794AFA00677359,
  -				A82144A408794AFA00677359,
  -				A82144A608794AFA00677359,
  -				A82144AC08794AFA00677359,
  -				A82144B008794AFA00677359,
  -				A82144B208794AFA00677359,
  -				A82144B408794AFA00677359,
  -				A82144B608794AFA00677359,
  -				A82144B808794AFA00677359,
  -				A82144BA08794AFA00677359,
  -				A82144BC08794AFA00677359,
  -				A82144BE08794AFA00677359,
  -				A82144C008794AFA00677359,
  -				A82144C208794AFA00677359,
  -				A82144C408794AFA00677359,
  -				A82144C608794AFA00677359,
  -				A82144C808794AFA00677359,
  -				A82144CA08794AFA00677359,
  -				A82144CC08794AFA00677359,
  -				A82144CE08794AFA00677359,
  -				A82144D008794AFA00677359,
  -				A82144D208794AFA00677359,
  -				A82144D408794AFA00677359,
  -				A82144D608794AFA00677359,
  -				A82144D808794AFA00677359,
  -				A82144DA08794AFA00677359,
  -				A82144DC08794AFA00677359,
  -				A82144DE08794AFA00677359,
  -				A82144E008794AFA00677359,
  -				A82144E208794AFA00677359,
  -				A82144E408794AFA00677359,
  -				A82144E608794AFA00677359,
  -				A82144E808794AFA00677359,
  -				A82144EA08794AFA00677359,
  -				A82144EC08794AFA00677359,
  -				A82144EE08794AFA00677359,
  -				A82144F008794AFA00677359,
  -				A82144F208794AFA00677359,
  -				A82144F408794AFA00677359,
  -				A82144F608794AFA00677359,
  -				A82144F808794AFA00677359,
  -				A82144FA08794AFA00677359,
  -				A82144FC08794AFA00677359,
  -				A82144FE08794AFA00677359,
  -				A821450008794AFA00677359,
  -				A821450208794AFA00677359,
  -				A821450408794AFA00677359,
  -				A821450608794AFA00677359,
  -				A821450808794AFA00677359,
  -				A821450A08794AFA00677359,
  -				A821450C08794AFA00677359,
  -				A821450E08794AFA00677359,
  -				A821451008794AFA00677359,
  -				A821451208794AFA00677359,
  -				A821451408794AFA00677359,
  -				A821451608794AFA00677359,
  -				A821451808794AFA00677359,
  -				A821451A08794AFB00677359,
  -				A821451C08794AFB00677359,
  -				A821451E08794AFB00677359,
  -				A821452008794AFB00677359,
  -				A821452208794AFB00677359,
  -				A821452408794AFB00677359,
  -				A821452608794AFB00677359,
  -				A821452808794AFB00677359,
  -				A821452A08794AFB00677359,
  -				A821452C08794AFB00677359,
  -				A821452E08794AFB00677359,
  -				A821453008794AFB00677359,
  -				A821453208794AFB00677359,
  -				A821453408794AFB00677359,
  -				A821453608794AFB00677359,
  -				A821453808794AFB00677359,
  -				A821453A08794AFB00677359,
  -				A821453C08794AFB00677359,
  -				A821453E08794AFB00677359,
  -				A821454008794AFB00677359,
  -				A821454208794AFB00677359,
  -				A821454408794AFB00677359,
  -				A821454608794AFB00677359,
  -				A821454808794AFB00677359,
  -				A821454A08794AFB00677359,
  -				A821454C08794AFB00677359,
  -				A821454E08794AFB00677359,
  -				A821455008794AFB00677359,
  -				A821455208794AFB00677359,
  -				A821455408794AFB00677359,
  -				A821455608794AFB00677359,
  -				A821455808794AFB00677359,
  -				A821455A08794AFB00677359,
  -				A821455C08794AFB00677359,
  -				A821455E08794AFB00677359,
  -				A821456008794AFB00677359,
  -				A821456208794AFB00677359,
  -				A821456408794AFB00677359,
  -				A821456608794AFB00677359,
  -				A821456808794AFB00677359,
  -				A821456A08794AFB00677359,
  -				A821456C08794AFB00677359,
  -				A821456E08794AFB00677359,
  -				A821457008794AFB00677359,
  -				A821457208794AFB00677359,
  -				A821457408794AFB00677359,
  -				A821457608794AFB00677359,
  -				A821457808794AFB00677359,
  -				A821457A08794AFB00677359,
  -				A821457C08794AFB00677359,
  -				A821457E08794AFB00677359,
  -				A821458008794AFB00677359,
  -				A821458208794AFB00677359,
  -				A821458408794AFB00677359,
  -				A821458608794AFB00677359,
  -				A821458808794AFB00677359,
  -				A821458A08794AFB00677359,
  -				A821458C08794AFB00677359,
  -				A821458E08794AFB00677359,
  -				A821459008794AFB00677359,
  -				A821459308794AFB00677359,
  -				A821459808794AFB00677359,
  -				A821459A08794AFB00677359,
  -				A821459E08794AFB00677359,
  -				A82145A008794AFB00677359,
  -				A82145A208794AFB00677359,
  -				A82145A508794AFB00677359,
  -				A82145A708794AFB00677359,
  -				A82145A908794AFB00677359,
  -				A82145AB08794AFB00677359,
  -				A82145AD08794AFB00677359,
  -				A82145AF08794AFB00677359,
  -				A82145B108794AFB00677359,
  -				A82145B308794AFB00677359,
  -				A82145B508794AFB00677359,
  -				A82145B708794AFB00677359,
  -				A82145B908794AFB00677359,
  -				A82145BB08794AFB00677359,
  -				A82145BD08794AFB00677359,
  -				A82145BF08794AFB00677359,
  -				A82145C108794AFB00677359,
  -				A82145C308794AFB00677359,
  -				A82145C608794AFB00677359,
  -				A82145C808794AFB00677359,
  -				A82145CA08794AFC00677359,
  -				A82145CC08794AFC00677359,
  -				A82145D108794AFC00677359,
  -				A82145D308794AFC00677359,
  -				A82145D508794AFC00677359,
  -				A82145D708794AFC00677359,
  -				A82145D908794AFC00677359,
  -				A82145DB08794AFC00677359,
  -				A82145DD08794AFC00677359,
  -				A82145DF08794AFC00677359,
  -				A82145E108794AFC00677359,
  -				A82145E308794AFC00677359,
  -				A82145E508794AFC00677359,
  -				A82145E708794AFC00677359,
  -				A82145E908794AFC00677359,
  -				A82145EB08794AFC00677359,
  -				A82145ED08794AFC00677359,
  -				A82145EF08794AFC00677359,
  -				A82145F108794AFC00677359,
  -				A82145F308794AFC00677359,
  -				A82145F508794AFC00677359,
  -				A82145F708794AFC00677359,
  -				A82145F908794AFC00677359,
  -				A82145FB08794AFC00677359,
  -				A82145FD08794AFC00677359,
  -				A82145FF08794AFC00677359,
  -				A821460108794AFC00677359,
  -				A821460308794AFC00677359,
  -				A821460508794AFC00677359,
  -				A821460708794AFC00677359,
  -				A821460908794AFC00677359,
  -				A821460B08794AFC00677359,
  -				A821460D08794AFC00677359,
  -				A821460F08794AFC00677359,
  -				A821461108794AFC00677359,
  -				A821461308794AFC00677359,
  -				A821461508794AFC00677359,
  -				A821461708794AFC00677359,
  -				A821461908794AFC00677359,
  -				A821461B08794AFC00677359,
  -				A821461D08794AFC00677359,
  -				A821461F08794AFC00677359,
  -				A821462108794AFC00677359,
  -				A821462308794AFC00677359,
  -				A821462608794AFC00677359,
  -				A821462808794AFC00677359,
  -				A821462A08794AFC00677359,
  -				A821462C08794AFC00677359,
  -				A821462E08794AFC00677359,
  -				A821463008794AFC00677359,
  -				A821463208794AFC00677359,
  -				A821463408794AFC00677359,
  -				A821463608794AFC00677359,
  -				A821463808794AFC00677359,
  -				A821463A08794AFD00677359,
  -				A821463C08794AFD00677359,
  -				A821463E08794AFD00677359,
  -				A821464008794AFD00677359,
  -				A821464208794AFD00677359,
  -				A821464408794AFD00677359,
  -				A821464608794AFD00677359,
  -				A821464808794AFD00677359,
  -				A821464A08794AFD00677359,
  -				A821464C08794AFD00677359,
  -				A821464E08794AFD00677359,
  -				A821465008794AFD00677359,
  -				A821465208794AFD00677359,
  -				A821465408794AFD00677359,
  -				A821465608794AFD00677359,
  -				A821465808794AFD00677359,
  -				A821465A08794AFD00677359,
  -				A821465C08794AFD00677359,
  -				A821465E08794AFD00677359,
  -				A821466008794AFD00677359,
  -				A821466208794AFD00677359,
  -				A821466408794AFD00677359,
  -				A821466608794AFD00677359,
  -				A821466808794AFD00677359,
  -				A821466A08794AFD00677359,
  -				A821466C08794AFD00677359,
  -				A821466E08794AFD00677359,
  -				A821467008794AFD00677359,
  -				A821467208794AFD00677359,
  -				A821467408794AFD00677359,
  -				A821467908794AFD00677359,
  -				A821467B08794AFD00677359,
  -				A821467D08794AFD00677359,
  -				A821467F08794AFD00677359,
  -				A821468108794AFD00677359,
  -				A821468308794AFD00677359,
  -				A821468508794AFD00677359,
  -				A821468708794AFD00677359,
  -				A821468908794AFD00677359,
  -				A821468B08794AFD00677359,
  -				A821468D08794AFD00677359,
  -				A821468F08794AFD00677359,
  -				A821469108794AFD00677359,
  -				A821469A08794AFD00677359,
  -				A821469C08794AFD00677359,
   				A85D7A8E0879EC64006A9172,
  -				A85D7AA8087A0C4C006A9172,
  -				A85D7AAC087A0C58006A9172,
  -				A85D7BA4087A6616006A9172,
   				A898F148088121ED0075EFB2,
   			);
   			isa = PBXSourcesBuildPhase;
  @@ -11845,12 +10681,6 @@
   			settings = {
   			};
   		};
  -		A8212C7008794A2300677359 = {
  -			fileRef = F523D27E02DE43D7018635CA;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
   		A8212C7108794A2300677359 = {
   			fileRef = F523D28502DE43D7018635CA;
   			isa = PBXBuildFile;
  @@ -12760,17349 +11590,225 @@
   			refType = 3;
   			sourceTree = BUILT_PRODUCTS_DIR;
   		};
  -		A8212D0F08794AB300677359 = {
  -			children = (
  -				A8212D1108794AB300677359,
  -				A8212D1208794AB300677359,
  -				A8212D6008794AB500677359,
  -				A8212D6108794AB500677359,
  -				A8212D6208794AB500677359,
  -				A8212D6308794AB500677359,
  -				A8212D6408794AB500677359,
  -				A8212D6508794AB500677359,
  -				A8212D6608794AB500677359,
  -				A8212D6708794AB500677359,
  -				A8212D6808794AB500677359,
  -				A8212D6908794AB500677359,
  -				A8212D6A08794AB500677359,
  -				A8212D6B08794AB500677359,
  -				A8212D6C08794AB500677359,
  -				A8212D6D08794AB500677359,
  -				A8212D6E08794AB500677359,
  -				A8212D6F08794AB500677359,
  -				A8212D7008794AB500677359,
  -				A8212D7108794AB500677359,
  -				A8212D7208794AB500677359,
  -				A8212D7308794AB500677359,
  -				A8212D7408794AB500677359,
  -				A8212D7508794AB500677359,
  -				A8212D7608794AB500677359,
  +		A85D722108795567006A9172 = {
  +			buildActionMask = 2147483647;
  +			files = (
   			);
  -			isa = PBXGroup;
  -			path = kcanvas;
  +			inputPaths = (
  +				$CREATE_HASH_TABLE,
  +				kdom/ecma/Ecma.cc,
  +			);
  +			isa = PBXShellScriptBuildPhase;
  +			name = "KDOM .lut.h files";
  +			outputPaths = (
  +				$DERIVED_FILE_DIR/Ecma.lut.h,
  +			);
  +			runOnlyForDeploymentPostprocessing = 0;
  +			shellPath = /bin/sh;
  +			shellScript = "\"$CREATE_HASH_TABLE\" kdom/ecma/Ecma.cc -n KDOM > \"$DERIVED_FILE_DIR/Ecma.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ecma/GlobalObject.cc -n KDOM > \"$DERIVED_FILE_DIR/GlobalObject.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ecma/Constructors.cc -n KDOM > \"$DERIVED_FILE_DIR/Constructors.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/EventTarget.cc -n KDOM > \"$DERIVED_FILE_DIR/EventTarget.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/Event.cc -n KDOM > \"$DERIVED_FILE_DIR/Event.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/EventException.cc -n KDOM > \"$DERIVED_FILE_DIR/EventException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/DocumentEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/UIEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/UIEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/MouseEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/MouseEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/KeyboardEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/Keyboa
 rdEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/MutationEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/MutationEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/views/AbstractView.cc -n KDOM > \"$DERIVED_FILE_DIR/AbstractView.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/views/DocumentView.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentView.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/StyleSheet.cc -n KDOM > \"$DERIVED_FILE_DIR/StyleSheet.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/StyleSheetList.cc -n KDOM > \"$DERIVED_FILE_DIR/StyleSheetList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/DocumentStyle.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentStyle.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSStyleSheet.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSStyleSheet.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/MediaList.cc -n KDOM > \"$DERIVED_FILE_DIR/MediaList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSRuleList.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSRuleList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSRule.cc -n KDOM > \"$DERIVED_FIL
 E_DIR/CSSRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSStyleRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSStyleRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSMediaRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSMediaRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSFontFaceRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSFontFaceRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSPageRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSPageRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSImportRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSImportRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSCharsetRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSCharsetRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSStyleDeclaration.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSStyleDeclaration.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSValue.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSValue.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSPrimitiveValue.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSPrimitiveValue.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSValue
 List.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSValueList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/RGBColor.cc -n KDOM > \"$DERIVED_FILE_DIR/RGBColor.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/Rect.cc -n KDOM > \"$DERIVED_FILE_DIR/Rect.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/Counter.cc -n KDOM > \"$DERIVED_FILE_DIR/Counter.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSParser.cc -n KDOM > \"$DERIVED_FILE_DIR/LSParser.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSParserFilter.cc -n KDOM > \"$DERIVED_FILE_DIR/LSParserFilter.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSInput.cc -n KDOM > \"$DERIVED_FILE_DIR/LSInput.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSOutput.cc -n KDOM > \"$DERIVED_FILE_DIR/LSOutput.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSSerializer.cc -n KDOM > \"$DERIVED_FILE_DIR/LSSerializer.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSResourceResolver.cc -n KDOM > \"$DERIVED_FILE_DIR/LSResourceResolver.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSSerializerFilter.cc -n KDOM > \"$DERIVED_FILE_
 DIR/LSSerializerFilter.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSException.cc -n KDOM > \"$DERIVED_FILE_DIR/LSException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/traversal/NodeFilter.cc -n KDOM > \"$DERIVED_FILE_DIR/NodeFilter.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/traversal/NodeIterator.cc -n KDOM > \"$DERIVED_FILE_DIR/NodeIterator.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/traversal/TreeWalker.cc -n KDOM > \"$DERIVED_FILE_DIR/TreeWalker.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/traversal/DocumentTraversal.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentTraversal.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/range/Range.cc -n KDOM > \"$DERIVED_FILE_DIR/Range.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/range/RangeException.cc -n KDOM > \"$DERIVED_FILE_DIR/RangeException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/range/DocumentRange.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentRange.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Attr.cc -n KDOM > \"$DERIVED_FILE_DIR/Attr.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Node.cc -n KDOM > \"$DERIVED
 _FILE_DIR/Node.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Text.cc -n KDOM > \"$DERIVED_FILE_DIR/Text.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Entity.cc -n KDOM > \"$DERIVED_FILE_DIR/Entity.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Element.cc -n KDOM > \"$DERIVED_FILE_DIR/Element.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Notation.cc -n KDOM > \"$DERIVED_FILE_DIR/Notation.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Document.cc -n KDOM > \"$DERIVED_FILE_DIR/Document.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/NodeList.cc -n KDOM > \"$DERIVED_FILE_DIR/NodeList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DocumentType.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentType.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/NamedNodeMap.cc -n KDOM > \"$DERIVED_FILE_DIR/NamedNodeMap.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMException.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/CharacterData.cc -n KDOM > \"$DERIVED_FILE_DIR/CharacterData.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMImplementation.cc -n KDOM > \"$DER
 IVED_FILE_DIR/DOMImplementation.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ProcessingInstruction.cc -n KDOM > \"$DERIVED_FILE_DIR/ProcessingInstruction.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMStringList.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMStringList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMUserData.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMUserData.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMConfiguration.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMConfiguration.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMLocator.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMLocator.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMError.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMError.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMErrorHandler.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMErrorHandler.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/TypeInfo.cc -n KDOM > \"$DERIVED_FILE_DIR/TypeInfo.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathNamespace.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathNamespace.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathException.cc -n KDOM > 
 \"$DERIVED_FILE_DIR/XPathException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathNSResolver.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathNSResolver.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathResult.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathResult.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathExpression.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathExpression.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathEvaluator.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathEvaluator.lut.h\"";
  +		};
  +		A85D722A087955F6006A9172 = {
  +			buildActionMask = 2147483647;
  +			files = (
  +			);
  +			inputPaths = (
  +				$CREATE_HASH_TABLE,
  +				ksvg2/events/SVGEvent.cc,
  +			);
  +			isa = PBXShellScriptBuildPhase;
  +			name = "KSVG2 .lut.h files";
  +			outputPaths = (
  +				$DERIVED_FILE_DIR/SVGEvent.lut.h,
  +			);
  +			runOnlyForDeploymentPostprocessing = 0;
  +			shellPath = /bin/sh;
  +			shellScript = "\"$CREATE_HASH_TABLE\" ksvg2/events/SVGEvent.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/events/SVGZoomEvent.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGZoomEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/ecma/Constructors.cc -n KSVG > \"$DERIVED_FILE_DIR/KSVG2Constructors.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/ecma/GlobalObject.cc -n KSVG > \"$DERIVED_FILE_DIR/KSVG2GlobalObject.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGException.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGException.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGColor.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGColor.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPaint.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPaint.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLength.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLength.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGDocument.cc -n KSVG > \"$DERIVED_FILE_DI
 R/SVGDocument.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTitleElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTitleElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGDescElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGDescElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGStylable.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGStylable.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGSVGElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGSVGElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGRectElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGRectElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLineElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLineElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGCircleElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGCircleElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGEllipseElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGEllipseElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGScriptElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGScriptElement.lut.h\"\n\"$CREATE_HAS
 H_TABLE\" ksvg2/dom/SVGStyleElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGStyleElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGURIReference.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGURIReference.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLangSpace.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLangSpace.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLocatable.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLocatable.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGRect.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGRect.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGMatrix.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGMatrix.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedString.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedString.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAngle.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAngle.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPoint.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPoint.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPointList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPointList.lut.h\"\n\"
 $CREATE_HASH_TABLE\" ksvg2/dom/SVGElementInstanceList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGElementInstanceList.lut.h\";\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedPoints.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedPoints.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPolylineElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPolylineElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPolygonElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPolygonElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGGElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGGElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGStringList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGStringList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTests.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTests.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGExternalResourcesRequired.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGExternalResourcesRequired.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedBoolean.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedBoolean.lu
 t.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTransform.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTransform.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTransformList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTransformList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedTransformList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedTransformList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTransformable.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTransformable.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGNumber.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGNumber.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedLength.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedLength.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedAngle.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedAngle.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedNumber.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedNumber.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGDefsElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGDefsElement.lut.h\"\n\"$CREA
 TE_HASH_TABLE\" ksvg2/dom/SVGStopElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGStopElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedEnumeration.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedEnumeration.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGGradientElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGGradientElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLinearGradientElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLinearGradientElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGRadialGradientElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGRadialGradientElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSeg.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSeg.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegMoveto.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegMoveto.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegLineto.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegLineto.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegLinetoHorizontal.cc -n KSVG > \"$DERIVED_FILE_DIR
 /SVGPathSegLinetoHorizontal.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegLinetoVertical.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegLinetoVertical.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegArc.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegArc.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegCurvetoCubic.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegCurvetoCubic.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegCurvetoCubicSmooth.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegCurvetoCubicSmooth.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegCurvetoQuadratic.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegCurvetoQuadratic.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegCurvetoQuadraticSmooth.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegCurvetoQuadraticSmooth.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedRect.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedRect.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFitToViewBox.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFitToVie
 wBox.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGZoomAndPan.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGZoomAndPan.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPreserveAspectRatio.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPreserveAspectRatio.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedPreserveAspectRatio.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedPreserveAspectRatio.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGImageElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGImageElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGClipPathElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGClipPathElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGSymbolElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGSymbolElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGSwitchElement.cc -n KSVG > \"$DERIVED_FILE_DI
 R/SVGSwitchElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGUseElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGUseElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPatternElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPatternElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGElementInstance.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGElementInstance.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimationElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimationElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimateColorElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimateColorElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimateTransformElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimateTransformElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimateElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimateElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGSetElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGSetElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegList.cc -n K
 SVG > \"$DERIVED_FILE_DIR/SVGPathSegList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedPathData.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedPathData.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGMarkerElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGMarkerElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGViewElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGViewElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLengthList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLengthList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedLengthList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedLengthList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedInteger.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedInteger.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFilterElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFilterElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEGaussianBlurElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEGaussianBlurElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEBle
 ndElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEBlendElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEFloodElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEFloodElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFETileElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFETileElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEMergeElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEMergeElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEMergeNodeElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEMergeNodeElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEOffsetElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEOffsetElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEComponentTransferElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEComponentTransferElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGComponentTransferFunctionElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGComponentTransferFunctionElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFECompositeElement.cc -n KSVG > \"$DER
 IVED_FILE_DIR/SVGFECompositeElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEColorMatrixElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEColorMatrixElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEImageElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEImageElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFETurbulenceElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFETurbulenceElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFilterPrimitiveStandardAttributes.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFilterPrimitiveStandardAttributes.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGNumberList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGNumberList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTextElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTextElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTSpanElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTSpanElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTextContentElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTextContentElement.lut.h\"\n\"$CRE
 ATE_HASH_TABLE\" ksvg2/dom/SVGTextPositioningElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTextPositioningElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedNumberList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedNumberList.lut.h\"";
  +		};
  +		A85D722E087956C0006A9172 = {
  +			buildActionMask = 2147483647;
  +			files = (
  +			);
  +			inputPaths = (
  +				kdom/css/impl/cssproperties.in,
  +				kdom/scripts/cssmakeprops,
  +			);
  +			isa = PBXShellScriptBuildPhase;
  +			name = kdomcssproperties.c/h;
  +			outputPaths = (
  +				$DERIVED_FILE_DIR/kdomcssproperties.c,
  +				$DERIVED_FILE_DIR/kdomcssproperties.h,
  +			);
  +			runOnlyForDeploymentPostprocessing = 0;
  +			shellPath = /bin/sh;
  +			shellScript = "cat kdom/css/impl/cssproperties.in > \"$DERIVED_FILE_DIR/kdomcssproperties.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakeprops\" -n KDOM -f kdomcssproperties.in";
  +		};
  +		A85D72340879573B006A9172 = {
  +			buildActionMask = 2147483647;
  +			files = (
  +			);
  +			inputPaths = (
  +				kdom/css/impl/cssvalues.in,
  +				kdom/scripts/cssmakevalues,
  +			);
  +			isa = PBXShellScriptBuildPhase;
  +			name = kdomcssvalues.c/h;
  +			outputPaths = (
  +				$DERIVED_FILE_DIR/kdomcssvalues.c,
  +				$DERIVED_FILE_DIR/kdomcssvalues.h,
  +			);
  +			runOnlyForDeploymentPostprocessing = 0;
  +			shellPath = /bin/sh;
  +			shellScript = "cat kdom/css/impl/cssvalues.in > \"$DERIVED_FILE_DIR/kdomcssvalues.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakevalues\" -n KDOM -f kdomcssvalues.in";
  +		};
  +		A85D723A0879577B006A9172 = {
  +			buildActionMask = 2147483647;
  +			files = (
  +			);
  +			inputPaths = (
  +				ksvg2/css/impl/cssproperties.in,
  +				kdom/scripts/cssmakeprops,
  +			);
  +			isa = PBXShellScriptBuildPhase;
  +			name = ksvgcssproperties.c/h;
  +			outputPaths = (
  +				$DERIVED_FILE_DIR/ksvgcssproperties.c,
  +				$DERIVED_FILE_DIR/ksvgcssproperties.h,
  +			);
  +			runOnlyForDeploymentPostprocessing = 0;
  +			shellPath = /bin/sh;
  +			shellScript = "cat ksvg2/css/impl/cssproperties.in > \"$DERIVED_FILE_DIR/ksvgcssproperties.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakeprops\" -n KSVG -f ksvgcssproperties.in";
  +		};
  +		A85D7240087957D1006A9172 = {
  +			buildActionMask = 2147483647;
  +			files = (
  +			);
  +			inputPaths = (
  +				ksvg2/css/impl/cssvalues.in,
  +				kdom/scripts/cssmakevalues,
  +			);
  +			isa = PBXShellScriptBuildPhase;
  +			name = ksvgcssvalues.c/h;
  +			outputPaths = (
  +				$DERIVED_FILE_DIR/ksvgcssvalues.c,
  +				$DERIVED_FILE_DIR/ksvgcssvalues.h,
  +			);
  +			runOnlyForDeploymentPostprocessing = 0;
  +			shellPath = /bin/sh;
  +			shellScript = "cat ksvg2/css/impl/cssvalues.in > \"$DERIVED_FILE_DIR/ksvgcssvalues.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakevalues\" -n KSVG -f ksvgcssvalues.in";
  +		};
  +		A85D7A2F0879EBA9006A9172 = {
  +			isa = PBXFileReference;
  +			lastKnownFileType = wrapper.framework;
  +			name = QuartzCore.framework;
  +			path = /System/Library/Frameworks/QuartzCore.framework;
  +			refType = 0;
  +			sourceTree = "<absolute>";
  +		};
  +		A85D7A300879EBA9006A9172 = {
  +			fileRef = A85D7A2F0879EBA9006A9172;
  +			isa = PBXBuildFile;
  +			settings = {
  +			};
  +		};
  +		A85D7A8C0879EC64006A9172 = {
  +			fileEncoding = 30;
  +			isa = PBXFileReference;
  +			lastKnownFileType = sourcecode.cpp.objcpp;
  +			path = KWQWMatrix.mm;
   			refType = 4;
   			sourceTree = "<group>";
   		};
  -		A8212D1108794AB300677359 = {
  -			fileEncoding = 4;
  +		A85D7A8D0879EC64006A9172 = {
  +			fileEncoding = 30;
   			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = DESIGN;
  +			lastKnownFileType = sourcecode.c.h;
  +			path = KWQWMatrix.h;
   			refType = 4;
   			sourceTree = "<group>";
   		};
  -		A8212D1208794AB300677359 = {
  +		A85D7A8E0879EC64006A9172 = {
  +			fileRef = A85D7A8C0879EC64006A9172;
  +			isa = PBXBuildFile;
  +			settings = {
  +			};
  +		};
  +		A85D7A8F0879EC64006A9172 = {
  +			fileRef = A85D7A8D0879EC64006A9172;
  +			isa = PBXBuildFile;
  +			settings = {
  +			};
  +		};
  +		A898F147088121E90075EFB2 = {
  +			fileRef = BCEF3433087B563E00BBF833;
  +			isa = PBXBuildFile;
  +			settings = {
  +			};
  +		};
  +		A898F148088121ED0075EFB2 = {
  +			fileRef = BCEF3432087B563E00BBF833;
  +			isa = PBXBuildFile;
  +			settings = {
  +			};
  +		};
  +		A8FD8B86087CB44C00DC3707 = {
  +			fileRef = A85D7A8C0879EC64006A9172;
  +			isa = PBXBuildFile;
  +			settings = {
  +			};
  +		};
  +		A8FD8B87087CB45700DC3707 = {
  +			fileRef = A85D7A8D0879EC64006A9172;
  +			isa = PBXBuildFile;
  +			settings = {
  +			};
  +		};
  +//A80
  +//A81
  +//A82
  +//A83
  +//A84
  +//BC0
  +//BC1
  +//BC2
  +//BC3
  +//BC4
  +		BC06F24406D18A35004A6FA3 = {
   			children = (
  -				A8212D3A08794AB400677359,
  -				A8212D3C08794AB400677359,
  -				A8212D3E08794AB400677359,
  -				A8212D3F08794AB400677359,
  -				A8212D4008794AB400677359,
  -				A8212D4108794AB400677359,
  -				A8212D4208794AB400677359,
  -				A8212D4308794AB400677359,
  -				A8212D4408794AB400677359,
  -				A8212D4508794AB400677359,
  -				A8212D4608794AB400677359,
  -				A8212D4708794AB400677359,
  -				A8212D4808794AB400677359,
  -				A8212D4908794AB400677359,
  -				A8212D4A08794AB400677359,
  -				A8212D4B08794AB400677359,
  -				A8212D4C08794AB400677359,
  -				A8212D4D08794AB400677359,
  -				A8212D4E08794AB400677359,
  -				A8212D5008794AB400677359,
  +				BC06F24906D18A7E004A6FA3,
  +				BC06F24A06D18A7E004A6FA3,
  +				BC06F24B06D18A7E004A6FA3,
  +				BC06F24C06D18A7E004A6FA3,
   			);
   			isa = PBXGroup;
  -			path = device;
  -			refType = 4;
  -			sourceTree = "<group>";
  +			name = xsl;
  +			path = khtml;
  +			refType = 2;
  +			sourceTree = SOURCE_ROOT;
   		};
  -		A8212D3A08794AB400677359 = {
  -			fileEncoding = 4;
  +		BC06F24906D18A7E004A6FA3 = {
  +			fileEncoding = 30;
   			isa = PBXFileReference;
   			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingDevice.cc;
  +			name = xsl_stylesheetimpl.cpp;
  +			path = xsl/xsl_stylesheetimpl.cpp;
   			refType = 4;
   			sourceTree = "<group>";
   		};
  -		A8212D3C08794AB400677359 = {
  -			fileEncoding = 4;
  +		BC06F24A06D18A7E004A6FA3 = {
  +			fileEncoding = 30;
   			isa = PBXFileReference;
   			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingDevice.h;
  +			name = xsl_stylesheetimpl.h;
  +			path = xsl/xsl_stylesheetimpl.h;
   			refType = 4;
   			sourceTree = "<group>";
   		};
  -		A8212D3E08794AB400677359 = {
  -			fileEncoding = 4;
  +		BC06F24B06D18A7E004A6FA3 = {
  +			fileEncoding = 30;
   			isa = PBXFileReference;
   			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingDeviceFactory.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D3F08794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingDeviceFactory.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4008794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingFillPainter.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4108794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingFillPainter.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4208794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingPaintServer.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4308794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingPaintServerGradient.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4408794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingPaintServerGradient.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4508794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingPaintServerImage.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4608794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingPaintServerImage.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4708794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingPaintServerPattern.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4808794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingPaintServerPattern.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4908794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingPaintServerSolid.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4A08794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingPaintServerSolid.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4B08794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingStrokePainter.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4C08794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingStrokePainter.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4D08794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KRenderingStyle.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D4E08794AB400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingStyle.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5008794AB400677359 = {
  -			children = (
  -				A8212D5108794AB500677359,
  -				A8212D5208794AB500677359,
  -				A8212D5308794AB500677359,
  -				A8212D5408794AB500677359,
  -				A8212D5508794AB500677359,
  -				A8212D5608794AB500677359,
  -				A8212D5708794AB500677359,
  -				A8212D5808794AB500677359,
  -				A8212D5908794AB500677359,
  -				A8212D5A08794AB500677359,
  -				A8212D5B08794AB500677359,
  -				A8212D5C08794AB500677359,
  -				A8212D5D08794AB500677359,
  -				A8212D5E08794AB500677359,
  -				A8212D5F08794AB500677359,
  -			);
  -			isa = PBXGroup;
  -			path = quartz;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5108794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasFilterQuartz.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5208794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KCanvasFilterQuartz.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5308794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasItemQuartz.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5408794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KCanvasItemQuartz.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5508794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasResourcesQuartz.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5608794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KCanvasResourcesQuartz.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5708794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasViewQuartz.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5808794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KCanvasViewQuartz.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5908794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingDeviceQuartz.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5A08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KRenderingDeviceQuartz.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5B08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KRenderingPaintServerGradientQuartz.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5C08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KRenderingPaintServerQuartz.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5D08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KRenderingPaintServerQuartz.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5E08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = QuartzSupport.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D5F08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = QuartzSupport.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6008794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvas.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6108794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvas.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6208794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasContainer.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6308794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasContainer.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6408794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasCreator.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6508794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasCreator.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6608794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasFilters.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6708794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasFilters.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6808794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasImage.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6908794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasImage.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6A08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasItem.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6B08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasItem.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6C08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasMatrix.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6D08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasMatrix.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6E08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasPath.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D6F08794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasRegistry.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D7008794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasRegistry.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D7108794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasResourceListener.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D7208794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasResources.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D7308794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasResources.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D7408794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasTypes.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D7508794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasView.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D7608794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasView.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D8208794AB500677359 = {
  -			children = (
  -				A8212D8308794AB500677359,
  -				A8212D8408794AB500677359,
  -				A8212D8508794AB500677359,
  -				A8212D8608794AB600677359,
  -				A8212D9908794AB600677359,
  -				A8212DF108794AB700677359,
  -				A8212DF208794AB700677359,
  -				A8212DF308794AB700677359,
  -				A8212DF408794AB700677359,
  -				A8212DF508794AB700677359,
  -				A8212DF608794AB700677359,
  -				A8212DF808794AB700677359,
  -				A8212E6C08794AB900677359,
  -				A8212E7F08794AB900677359,
  -				A8212E8008794AB900677359,
  -				A8212E8108794AB900677359,
  -				A8212E8208794ABA00677359,
  -				A8212E8308794ABA00677359,
  -				A8212E8408794ABA00677359,
  -				A8212E8508794ABA00677359,
  -				A8212E8608794ABA00677359,
  -				A8212E8708794ABA00677359,
  -				A8212E8808794ABA00677359,
  -				A8212E8908794ABA00677359,
  -				A8212E8A08794ABA00677359,
  -				A8212E8B08794ABA00677359,
  -				A8212E8C08794ABA00677359,
  -				A8212E8D08794ABA00677359,
  -				A8212E8E08794ABA00677359,
  -				A8212E8F08794ABA00677359,
  -				A8212E9008794ABA00677359,
  -				A8212E9108794ABA00677359,
  -				A8212E9208794ABA00677359,
  -				A8212E9308794ABA00677359,
  -				A8212E9408794ABA00677359,
  -				A8212E9508794ABA00677359,
  -				A8212E9608794ABA00677359,
  -				A8212E9708794ABA00677359,
  -				A8212E9808794ABA00677359,
  -				A8212E9908794ABA00677359,
  -				A8212EA808794ABA00677359,
  -				A8212EA908794ABA00677359,
  -				A8212EAA08794ABA00677359,
  -				A8212EAB08794ABA00677359,
  -				A8212EAC08794ABA00677359,
  -				A8212EAD08794ABA00677359,
  -				A8212EAE08794ABA00677359,
  -				A8212ED908794ABB00677359,
  -				A8212EDA08794ABB00677359,
  -				A8212EDB08794ABB00677359,
  -				A8212F2008794ABC00677359,
  -				A8212F2308794ABC00677359,
  -				A8212F2408794ABC00677359,
  -				A8212F2508794ABC00677359,
  -				A8212F2608794ABC00677359,
  -				A8212F2708794ABC00677359,
  -				A8212F2808794ABC00677359,
  -				A8212F3108794ABC00677359,
  -				A8212F5908794ABD00677359,
  -				A8212F5A08794ABD00677359,
  -				A8212F5B08794ABD00677359,
  -				A8212F5C08794ABD00677359,
  -				A8212F5D08794ABD00677359,
  -				A8212F5E08794ABD00677359,
  -				A8212F5F08794ABD00677359,
  -				A8212F6008794ABD00677359,
  -				A8212F6108794ABD00677359,
  -				A8212F6208794ABD00677359,
  -				A8212F6308794ABD00677359,
  -				A8212F6E08794ABD00677359,
  -				A8212F6F08794ABD00677359,
  -				A8212F7008794ABD00677359,
  -				A8212F8108794ABD00677359,
  -				A8212F9108794ABE00677359,
  -				A8212F9208794ABE00677359,
  -				A8212FAA08794ABF00677359,
  -				A8212FAB08794ABF00677359,
  -				A8212FAD08794ABF00677359,
  -				A8212FC408794ABF00677359,
  -				A8212FC508794ABF00677359,
  -				A8212FC608794ABF00677359,
  -				A8212FC708794ABF00677359,
  -				A8212FF208794AC000677359,
  -				A821306C08794AC100677359,
  -			);
  -			isa = PBXGroup;
  -			path = kdom;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D8308794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Attr.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D8408794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Attr.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D8508794AB500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = AUTHORS;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D8608794AB600677359 = {
  -			children = (
  -				A8212D8708794AB600677359,
  -			);
  -			isa = PBXGroup;
  -			path = backends;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D8708794AB600677359 = {
  -			children = (
  -				A8212D8908794AB600677359,
  -				A8212D8A08794AB600677359,
  -			);
  -			isa = PBXGroup;
  -			path = libxml;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D8908794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LibXMLParser.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D8A08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LibXMLParser.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D9908794AB600677359 = {
  -			children = (
  -				A8212D9A08794AB600677359,
  -				A8212D9B08794AB600677359,
  -				A8212D9C08794AB600677359,
  -				A8212D9D08794AB600677359,
  -				A8212D9E08794AB600677359,
  -				A8212D9F08794AB600677359,
  -				A8212DA008794AB600677359,
  -				A8212DA108794AB600677359,
  -				A8212DA208794AB600677359,
  -				A8212DA408794AB600677359,
  -				A8212DA508794AB600677359,
  -				A8212DA608794AB600677359,
  -				A8212DA708794AB600677359,
  -				A8212DA808794AB600677359,
  -				A8212DA908794AB600677359,
  -				A8212DAA08794AB600677359,
  -				A8212DAB08794AB600677359,
  -				A8212DAF08794AB700677359,
  -				A8212DB008794AB700677359,
  -			);
  -			isa = PBXGroup;
  -			path = cache;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D9A08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = IconData.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D9B08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ImageSource.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D9C08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ImageSource.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D9D08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMCache.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D9E08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCache.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212D9F08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMCachedDocument.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA008794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCachedDocument.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA108794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMCachedImage.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA208794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCachedImage.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA408794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMCachedObject.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA508794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCachedObject.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA608794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCachedObjectClient.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA708794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMCachedScript.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA808794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCachedScript.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DA908794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMCachedStyleSheet.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DAA08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCachedStyleSheet.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DAB08794AB600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCacheHelper.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DAF08794AB700677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMLoader.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DB008794AB700677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMLoader.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DF108794AB700677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CDATASection.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DF208794AB700677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CDATASection.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DF308794AB700677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CharacterData.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DF408794AB700677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CharacterData.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DF508794AB700677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Comment.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DF608794AB700677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Comment.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DF808794AB700677359 = {
  -			children = (
  -				A8212DF908794AB800677359,
  -				A8212DFA08794AB800677359,
  -				A8212DFB08794AB800677359,
  -				A8212DFC08794AB800677359,
  -				A8212DFD08794AB800677359,
  -				A8212DFE08794AB800677359,
  -				A8212DFF08794AB800677359,
  -				A8212E0008794AB800677359,
  -				A8212E0108794AB800677359,
  -				A8212E0208794AB800677359,
  -				A8212E0308794AB800677359,
  -				A8212E0408794AB800677359,
  -				A8212E0508794AB800677359,
  -				A8212E0608794AB800677359,
  -				A8212E0708794AB800677359,
  -				A8212E0808794AB800677359,
  -				A8212E0908794AB800677359,
  -				A8212E0A08794AB800677359,
  -				A8212E0B08794AB800677359,
  -				A8212E0C08794AB800677359,
  -				A8212E0D08794AB800677359,
  -				A8212E0E08794AB800677359,
  -				A8212E0F08794AB800677359,
  -				A8212E1008794AB800677359,
  -				A8212E1108794AB800677359,
  -				A8212E1208794AB800677359,
  -				A8212E1308794AB800677359,
  -				A8212E1408794AB800677359,
  -				A8212E1508794AB800677359,
  -				A8212E1608794AB800677359,
  -				A8212E1708794AB800677359,
  -				A8212E1808794AB800677359,
  -				A8212E1908794AB800677359,
  -				A8212E1A08794AB800677359,
  -				A8212E1B08794AB800677359,
  -				A8212E1C08794AB800677359,
  -				A8212E1D08794AB800677359,
  -				A8212E1E08794AB800677359,
  -				A8212E5C08794AB900677359,
  -				A8212E5D08794AB900677359,
  -				A8212E5E08794AB900677359,
  -				A8212E6008794AB900677359,
  -				A8212E6108794AB900677359,
  -				A8212E6208794AB900677359,
  -				A8212E6308794AB900677359,
  -				A8212E6408794AB900677359,
  -				A8212E6508794AB900677359,
  -				A8212E6608794AB900677359,
  -				A8212E6708794AB900677359,
  -				A8212E6808794AB900677359,
  -				A8212E6908794AB900677359,
  -				A8212E6A08794AB900677359,
  -				A8212E6B08794AB900677359,
  -			);
  -			isa = PBXGroup;
  -			path = css;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DF908794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Counter.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DFA08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Counter.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DFB08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSCharsetRule.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DFC08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSCharsetRule.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DFD08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSFontFaceRule.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DFE08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSFontFaceRule.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212DFF08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSHelper.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0008794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSImportRule.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0108794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSImportRule.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0208794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSMediaRule.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0308794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSMediaRule.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0408794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSPageRule.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0508794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSPageRule.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0608794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSPrimitiveValue.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0708794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSPrimitiveValue.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0808794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSRule.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0908794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSRule.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0A08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSRuleList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0B08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSRuleList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0C08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSStyleDeclaration.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0D08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSStyleDeclaration.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0E08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSStyleRule.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E0F08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSStyleRule.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1008794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSStyleSheet.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1108794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSStyleSheet.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1208794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSUnknownRule.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1308794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSUnknownRule.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1408794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSValue.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1508794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSValue.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1608794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSValueList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1708794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSValueList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1808794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentCSS.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1908794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentCSS.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1A08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentStyle.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1B08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentStyle.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1C08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMImplementationCSS.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1D08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMImplementationCSS.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1E08794AB800677359 = {
  -			children = (
  -				A8212E1F08794AB800677359,
  -				A8212E2008794AB800677359,
  -				A8212E2108794AB800677359,
  -				A8212E2208794AB800677359,
  -				A8212E2308794AB800677359,
  -				A8212E2408794AB800677359,
  -				A8212E2508794AB800677359,
  -				A8212E2608794AB800677359,
  -				A8212E2708794AB800677359,
  -				A8212E2808794AB800677359,
  -				A8212E2908794AB800677359,
  -				A8212E2A08794AB800677359,
  -				A8212E2B08794AB800677359,
  -				A8212E2C08794AB800677359,
  -				A8212E2D08794AB800677359,
  -				A8212E2E08794AB800677359,
  -				A8212E2F08794AB800677359,
  -				A8212E3008794AB800677359,
  -				A8212E3108794AB800677359,
  -				A8212E3208794AB800677359,
  -				A8212E3308794AB800677359,
  -				A8212E3408794AB800677359,
  -				A8212E3508794AB800677359,
  -				A8212E3608794AB800677359,
  -				A8212E3708794AB800677359,
  -				A8212E3808794AB800677359,
  -				A8212E3908794AB800677359,
  -				A8212E3A08794AB800677359,
  -				A8212E3B08794AB800677359,
  -				A8212E3C08794AB800677359,
  -				A8212E3D08794AB800677359,
  -				A8212E3E08794AB800677359,
  -				A8212E3F08794AB800677359,
  -				A8212E4008794AB800677359,
  -				A8212E4108794AB800677359,
  -				A8212E4208794AB800677359,
  -				A8212E4308794AB800677359,
  -				A8212E4408794AB800677359,
  -				A8212E4508794AB800677359,
  -				A8212E4608794AB800677359,
  -				A8212E4708794AB800677359,
  -				A8212E4808794AB800677359,
  -				A8212E4908794AB800677359,
  -				A8212E4B08794AB800677359,
  -				A8212E4C08794AB800677359,
  -				A8212E4D08794AB800677359,
  -				A8212E4E08794AB800677359,
  -				A8212E4F08794AB800677359,
  -				A8212E5008794AB800677359,
  -				A8212E5108794AB800677359,
  -				A8212E5208794AB800677359,
  -				A8212E5308794AB800677359,
  -				A8212E5408794AB800677359,
  -				A8212E5508794AB800677359,
  -				A8212E5608794AB900677359,
  -				A8212E5708794AB900677359,
  -				A8212E5808794AB900677359,
  -				A8212E5908794AB900677359,
  -				A8212E5A08794AB900677359,
  -				A8212E5B08794AB900677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E1F08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CounterImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2008794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CounterImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2108794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSCharsetRuleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2208794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSCharsetRuleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2308794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSFontFaceRuleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2408794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSFontFaceRuleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2508794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSImageValueImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2608794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSImageValueImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2708794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSImportRuleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2808794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSImportRuleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2908794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSMediaRuleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2A08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSMediaRuleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2B08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSPageRuleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2C08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSPageRuleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2D08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMCSSParser.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2E08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMCSSParser.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E2F08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSPrimitiveValueImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3008794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSPrimitiveValueImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3108794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = cssproperties.in;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3208794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSRuleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3308794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSRuleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3408794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSRuleListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3508794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSRuleListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3608794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSStyleDeclarationImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3708794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSStyleDeclarationImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3808794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSStyleRuleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3908794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSStyleRuleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3A08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSStyleSelector.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3B08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSStyleSelector.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3C08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSStyleSheetImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3D08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSStyleSheetImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3E08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSUnknownRuleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E3F08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSUnknownRuleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4008794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSValueImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4108794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSValueImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4208794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CSSValueListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4308794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSValueListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4408794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = cssvalues.in;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4508794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentStyleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4608794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentStyleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4708794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Font.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4808794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Font.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4908794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.yacc;
  -			path = kdomparsercss.y;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4B08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = MediaListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4C08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = MediaListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4D08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RectImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4E08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RectImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E4F08794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RenderStyle.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5008794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RenderStyle.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5108794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RenderStyleDefs.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5208794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RenderStyleDefs.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5308794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RGBColorImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5408794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RGBColorImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5508794AB800677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = StyleBaseImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5608794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = StyleBaseImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5708794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = StyleSheetImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5808794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = StyleSheetImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5908794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = StyleSheetListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5A08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = StyleSheetListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5B08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = tokenizer.cpp;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5C08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = kdomcss.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5D08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LinkStyle.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E5E08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LinkStyle.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6008794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = MediaList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6108794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = MediaList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6208794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Rect.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6308794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Rect.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6408794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RGBColor.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6508794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RGBColor.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6608794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = StyleSheet.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6708794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = StyleSheet.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6808794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = StyleSheetList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6908794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = StyleSheetList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6A08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ViewCSS.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6B08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ViewCSS.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6C08794AB900677359 = {
  -			children = (
  -				A8212E6D08794AB900677359,
  -				A8212E6E08794AB900677359,
  -				A8212E6F08794AB900677359,
  -				A8212E7008794AB900677359,
  -				A8212E7108794AB900677359,
  -				A8212E7208794AB900677359,
  -				A8212E7408794AB900677359,
  -				A8212E7508794AB900677359,
  -				A8212E7608794AB900677359,
  -				A8212E7708794AB900677359,
  -			);
  -			isa = PBXGroup;
  -			path = data;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6D08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6E08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E6F08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EcmaConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E7008794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventsConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E7108794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = generateddata.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E7208794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E7408794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RangeConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E7508794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TraversalConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E7608794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ViewConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E7708794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E7F08794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Document.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8008794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Document.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8108794AB900677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentFragment.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8208794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentFragment.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8308794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentType.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8408794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentType.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8508794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMConfiguration.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8608794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMConfiguration.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8708794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMError.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8808794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMError.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8908794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMErrorHandler.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8A08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMErrorHandler.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8B08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMException.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8C08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMException.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8D08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMImplementation.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8E08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMImplementation.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E8F08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMLocator.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9008794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMLocator.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9108794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMObject.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9208794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMObject.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9308794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMString.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9408794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMString.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9508794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMStringList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9608794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMStringList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9708794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMUserData.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9808794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMUserData.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9908794ABA00677359 = {
  -			children = (
  -				A8212E9A08794ABA00677359,
  -				A8212E9B08794ABA00677359,
  -				A8212E9C08794ABA00677359,
  -				A8212E9D08794ABA00677359,
  -				A8212E9E08794ABA00677359,
  -				A8212E9F08794ABA00677359,
  -				A8212EA008794ABA00677359,
  -				A8212EA108794ABA00677359,
  -				A8212EA208794ABA00677359,
  -				A8212EA408794ABA00677359,
  -				A8212EA608794ABA00677359,
  -				A8212EA708794ABA00677359,
  -			);
  -			isa = PBXGroup;
  -			path = ecma;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9A08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Constructors.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9B08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Constructors.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9C08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMBridge.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9D08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMLookup.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9E08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Ecma.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212E9F08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Ecma.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EA008794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EcmaInterface.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EA108794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = GlobalObject.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EA208794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = GlobalObject.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EA408794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Helper.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EA608794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ScriptInterpreter.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EA708794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ScriptInterpreter.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EA808794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Element.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EA908794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Element.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EAA08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Entity.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EAB08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Entity.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EAC08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EntityReference.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EAD08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EntityReference.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EAE08794ABA00677359 = {
  -			children = (
  -				A8212EAF08794ABA00677359,
  -				A8212EB008794ABA00677359,
  -				A8212EB108794ABB00677359,
  -				A8212EB208794ABB00677359,
  -				A8212EB308794ABB00677359,
  -				A8212EB408794ABB00677359,
  -				A8212EB508794ABB00677359,
  -				A8212EB608794ABB00677359,
  -				A8212EB708794ABB00677359,
  -				A8212EB808794ABB00677359,
  -				A8212EB908794ABB00677359,
  -				A8212ECF08794ABB00677359,
  -				A8212ED008794ABB00677359,
  -				A8212ED108794ABB00677359,
  -				A8212ED308794ABB00677359,
  -				A8212ED408794ABB00677359,
  -				A8212ED508794ABB00677359,
  -				A8212ED608794ABB00677359,
  -				A8212ED708794ABB00677359,
  -				A8212ED808794ABB00677359,
  -			);
  -			isa = PBXGroup;
  -			path = events;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EAF08794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentEvent.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB008794ABA00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentEvent.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB108794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Event.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB208794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Event.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB308794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EventException.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB408794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventException.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB508794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EventListener.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB608794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventListener.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB708794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EventTarget.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB808794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventTarget.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EB908794ABB00677359 = {
  -			children = (
  -				A8212EBA08794ABB00677359,
  -				A8212EBB08794ABB00677359,
  -				A8212EBC08794ABB00677359,
  -				A8212EBD08794ABB00677359,
  -				A8212EBE08794ABB00677359,
  -				A8212EBF08794ABB00677359,
  -				A8212EC008794ABB00677359,
  -				A8212EC108794ABB00677359,
  -				A8212EC208794ABB00677359,
  -				A8212EC308794ABB00677359,
  -				A8212EC408794ABB00677359,
  -				A8212EC508794ABB00677359,
  -				A8212EC708794ABB00677359,
  -				A8212EC808794ABB00677359,
  -				A8212EC908794ABB00677359,
  -				A8212ECA08794ABB00677359,
  -				A8212ECB08794ABB00677359,
  -				A8212ECC08794ABB00677359,
  -				A8212ECD08794ABB00677359,
  -				A8212ECE08794ABB00677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EBA08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentEventImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EBB08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentEventImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EBC08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EventExceptionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EBD08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventExceptionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EBE08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EventImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EBF08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC008794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EventListenerImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC108794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventListenerImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC208794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EventTargetImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC308794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventTargetImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC408794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KeyboardEventImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC508794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KeyboardEventImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC708794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = MouseEventImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC808794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = MouseEventImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EC908794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = MutationEventImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ECA08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = MutationEventImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ECB08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RegisteredEventListener.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ECC08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RegisteredEventListener.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ECD08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = UIEventImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ECE08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = UIEventImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ECF08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = kdomevents.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED008794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KeyboardEvent.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED108794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KeyboardEvent.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED308794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = MouseEvent.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED408794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = MouseEvent.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED508794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = MutationEvent.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED608794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = MutationEvent.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED708794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = UIEvent.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED808794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = UIEvent.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212ED908794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Helper.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EDA08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Helper.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EDB08794ABB00677359 = {
  -			children = (
  -				A8212EDC08794ABB00677359,
  -				A8212EDD08794ABB00677359,
  -				A8212EDE08794ABB00677359,
  -				A8212EDF08794ABB00677359,
  -				A8212EE008794ABB00677359,
  -				A8212EE108794ABB00677359,
  -				A8212EE208794ABB00677359,
  -				A8212EE308794ABB00677359,
  -				A8212EE408794ABB00677359,
  -				A8212EE508794ABB00677359,
  -				A8212EE608794ABB00677359,
  -				A8212EE708794ABB00677359,
  -				A8212EE808794ABB00677359,
  -				A8212EE908794ABB00677359,
  -				A8212EEA08794ABB00677359,
  -				A8212EEB08794ABB00677359,
  -				A8212EEC08794ABB00677359,
  -				A8212EED08794ABB00677359,
  -				A8212EEE08794ABB00677359,
  -				A8212EEF08794ABB00677359,
  -				A8212EF008794ABB00677359,
  -				A8212EF108794ABB00677359,
  -				A8212EF208794ABB00677359,
  -				A8212EF308794ABB00677359,
  -				A8212EF408794ABB00677359,
  -				A8212EF508794ABB00677359,
  -				A8212EF608794ABB00677359,
  -				A8212EF708794ABB00677359,
  -				A8212EF808794ABB00677359,
  -				A8212EF908794ABB00677359,
  -				A8212EFA08794ABB00677359,
  -				A8212EFB08794ABB00677359,
  -				A8212EFC08794ABB00677359,
  -				A8212EFD08794ABB00677359,
  -				A8212EFE08794ABB00677359,
  -				A8212EFF08794ABB00677359,
  -				A8212F0008794ABB00677359,
  -				A8212F0108794ABB00677359,
  -				A8212F0208794ABB00677359,
  -				A8212F0308794ABB00677359,
  -				A8212F0408794ABB00677359,
  -				A8212F0508794ABB00677359,
  -				A8212F0608794ABB00677359,
  -				A8212F0708794ABB00677359,
  -				A8212F0908794ABB00677359,
  -				A8212F0A08794ABB00677359,
  -				A8212F0B08794ABB00677359,
  -				A8212F0C08794ABB00677359,
  -				A8212F0D08794ABB00677359,
  -				A8212F0E08794ABB00677359,
  -				A8212F1108794ABB00677359,
  -				A8212F1208794ABB00677359,
  -				A8212F1308794ABB00677359,
  -				A8212F1408794ABB00677359,
  -				A8212F1508794ABB00677359,
  -				A8212F1608794ABB00677359,
  -				A8212F1708794ABB00677359,
  -				A8212F1808794ABC00677359,
  -				A8212F1908794ABC00677359,
  -				A8212F1A08794ABC00677359,
  -				A8212F1B08794ABC00677359,
  -				A8212F1C08794ABC00677359,
  -				A8212F1D08794ABC00677359,
  -				A8212F1E08794ABC00677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EDC08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = AttrImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EDD08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = AttrImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EDE08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CDATASectionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EDF08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CDATASectionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE008794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CDFInterface.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE108794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CDFInterface.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE208794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CharacterDataImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE308794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CharacterDataImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE408794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CommentImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE508794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CommentImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE608794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentFragmentImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE708794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentFragmentImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE808794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EE908794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EEA08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentTypeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EEB08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentTypeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EEC08794ABB00677359 = {
  -			explicitFileType = sourcecode.cpp.cpp;
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			path = domattrs.c;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EED08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = domattrs.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EEE08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = domattrs.in;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EEF08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMConfigurationImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF008794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMConfigurationImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF108794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMErrorHandlerImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF208794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMErrorHandlerImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF308794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMErrorImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF408794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMErrorImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF508794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMExceptionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF608794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMExceptionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF708794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMImplementationImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF808794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMImplementationImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EF908794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EFA08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMLocatorImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EFB08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMLocatorImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EFC08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMStringImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EFD08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMStringImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EFE08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMStringListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212EFF08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMStringListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0008794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMUserDataImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0108794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMUserDataImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0208794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0308794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0408794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EntityImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0508794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EntityImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0608794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = EntityReferenceImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0708794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EntityReferenceImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0908794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NamedAttrMapImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0A08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NamedAttrMapImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0B08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NamedNodeMapImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0C08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NamedNodeMapImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0D08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NodeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F0E08794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NodeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1108794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NodeListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1208794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NodeListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1308794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NotationImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1408794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NotationImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1508794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ProcessingInstructionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1608794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ProcessingInstructionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1708794ABB00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = TagNodeListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1808794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TagNodeListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1908794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = TextImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1A08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TextImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1B08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = TypeInfoImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1C08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TypeInfoImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1D08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XMLElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F1E08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XMLElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F2008794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = kdom.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F2308794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMPart.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F2408794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMPart.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F2508794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMSettings.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F2608794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMSettings.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F2708794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMView.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F2808794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMView.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3108794ABC00677359 = {
  -			children = (
  -				A8212F3208794ABC00677359,
  -				A8212F3308794ABC00677359,
  -				A8212F3408794ABC00677359,
  -				A8212F4608794ABC00677359,
  -				A8212F4708794ABC00677359,
  -				A8212F4808794ABC00677359,
  -				A8212F4908794ABC00677359,
  -				A8212F4A08794ABC00677359,
  -				A8212F4B08794ABC00677359,
  -				A8212F4C08794ABC00677359,
  -				A8212F4D08794ABC00677359,
  -				A8212F4E08794ABC00677359,
  -				A8212F4F08794ABC00677359,
  -				A8212F5008794ABC00677359,
  -				A8212F5108794ABC00677359,
  -				A8212F5208794ABC00677359,
  -				A8212F5308794ABC00677359,
  -				A8212F5408794ABC00677359,
  -				A8212F5508794ABC00677359,
  -				A8212F5608794ABC00677359,
  -			);
  -			isa = PBXGroup;
  -			path = ls;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3208794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DOMImplementationLS.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3308794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DOMImplementationLS.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3408794ABC00677359 = {
  -			children = (
  -				A8212F3508794ABC00677359,
  -				A8212F3608794ABC00677359,
  -				A8212F3708794ABC00677359,
  -				A8212F3808794ABC00677359,
  -				A8212F3908794ABC00677359,
  -				A8212F3A08794ABC00677359,
  -				A8212F3B08794ABC00677359,
  -				A8212F3C08794ABC00677359,
  -				A8212F3D08794ABC00677359,
  -				A8212F3E08794ABC00677359,
  -				A8212F3F08794ABC00677359,
  -				A8212F4008794ABC00677359,
  -				A8212F4108794ABC00677359,
  -				A8212F4208794ABC00677359,
  -				A8212F4308794ABC00677359,
  -				A8212F4408794ABC00677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3508794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSExceptionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3608794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSExceptionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3708794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSInputImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3808794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSInputImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3908794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSOutputImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3A08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSOutputImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3B08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSParserFilterImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3C08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSParserFilterImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3D08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSParserImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3E08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSParserImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F3F08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSResourceResolverImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4008794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSResourceResolverImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4108794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSSerializerFilterImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4208794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSSerializerFilterImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4308794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSSerializerImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4408794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSSerializerImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4608794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = kdomls.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4708794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSException.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4808794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSException.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4908794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSInput.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4A08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSInput.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4B08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSOutput.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4C08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSOutput.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4D08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSParser.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4E08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSParser.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F4F08794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSParserFilter.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5008794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSParserFilter.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5108794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSResourceResolver.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5208794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSResourceResolver.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5308794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSSerializer.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5408794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSSerializer.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5508794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LSSerializerFilter.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5608794ABC00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LSSerializerFilter.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5908794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NamedNodeMap.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5A08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NamedNodeMap.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5B08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Namespace.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5C08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Node.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5D08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Node.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5E08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NodeList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F5F08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NodeList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6008794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Notation.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6108794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Notation.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6208794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = NOTES;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6308794ABD00677359 = {
  -			children = (
  -				A8212F6508794ABD00677359,
  -				A8212F6608794ABD00677359,
  -				A8212F6708794ABD00677359,
  -				A8212F6908794ABD00677359,
  -			);
  -			isa = PBXGroup;
  -			path = parser;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6508794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMDocumentBuilder.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6608794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMDocumentBuilder.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6708794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KDOMParser.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6908794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KDOMParser.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6E08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ProcessingInstruction.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F6F08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ProcessingInstruction.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7008794ABD00677359 = {
  -			children = (
  -				A8212F7108794ABD00677359,
  -				A8212F7208794ABD00677359,
  -				A8212F7308794ABD00677359,
  -				A8212F7B08794ABD00677359,
  -				A8212F7D08794ABD00677359,
  -				A8212F7E08794ABD00677359,
  -				A8212F7F08794ABD00677359,
  -				A8212F8008794ABD00677359,
  -			);
  -			isa = PBXGroup;
  -			path = range;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7108794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentRange.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7208794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentRange.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7308794ABD00677359 = {
  -			children = (
  -				A8212F7408794ABD00677359,
  -				A8212F7508794ABD00677359,
  -				A8212F7708794ABD00677359,
  -				A8212F7808794ABD00677359,
  -				A8212F7908794ABD00677359,
  -				A8212F7A08794ABD00677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7408794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentRangeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7508794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentRangeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7708794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RangeExceptionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7808794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RangeExceptionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7908794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RangeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7A08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RangeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7B08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = kdomrange.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7D08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Range.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7E08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Range.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F7F08794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = RangeException.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8008794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = RangeException.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8108794ABD00677359 = {
  -			children = (
  -				A8212F8208794ABD00677359,
  -				A8212F8508794ABE00677359,
  -				A8212F8608794ABE00677359,
  -				A8212F8C08794ABE00677359,
  -				A8212F8D08794ABE00677359,
  -				A8212F8E08794ABE00677359,
  -				A8212F8F08794ABE00677359,
  -			);
  -			isa = PBXGroup;
  -			path = scripts;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8208794ABD00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text.script.perl;
  -			path = constants.pl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8508794ABE00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text.script.perl;
  -			path = cssmakeprops;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8608794ABE00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text.script.perl;
  -			path = cssmakevalues;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8C08794ABE00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text.script.perl;
  -			path = dommakeattrs;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8D08794ABE00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text.script.perl;
  -			path = generate.pl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8E08794ABE00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text.script.perl;
  -			path = kalyptusKDOMEcma.pm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F8F08794ABE00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = OVERVIEW;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F9108794ABE00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Shared.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212F9208794ABE00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Shared.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FAA08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Text.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FAB08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Text.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FAD08794ABF00677359 = {
  -			children = (
  -				A8212FAE08794ABF00677359,
  -				A8212FAF08794ABF00677359,
  -				A8212FB008794ABF00677359,
  -				A8212FBC08794ABF00677359,
  -				A8212FBE08794ABF00677359,
  -				A8212FBF08794ABF00677359,
  -				A8212FC008794ABF00677359,
  -				A8212FC108794ABF00677359,
  -				A8212FC208794ABF00677359,
  -				A8212FC308794ABF00677359,
  -			);
  -			isa = PBXGroup;
  -			path = traversal;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FAE08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentTraversal.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FAF08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentTraversal.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB008794ABF00677359 = {
  -			children = (
  -				A8212FB108794ABF00677359,
  -				A8212FB208794ABF00677359,
  -				A8212FB408794ABF00677359,
  -				A8212FB508794ABF00677359,
  -				A8212FB608794ABF00677359,
  -				A8212FB708794ABF00677359,
  -				A8212FB808794ABF00677359,
  -				A8212FB908794ABF00677359,
  -				A8212FBA08794ABF00677359,
  -				A8212FBB08794ABF00677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB108794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentTraversalImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB208794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentTraversalImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB408794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NodeFilterImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB508794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NodeFilterImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB608794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NodeIteratorImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB708794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NodeIteratorImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB808794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = TraversalImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FB908794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TraversalImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FBA08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = TreeWalkerImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FBB08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TreeWalkerImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FBC08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = kdomtraversal.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FBE08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NodeFilter.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FBF08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NodeFilter.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC008794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NodeIterator.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC108794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NodeIterator.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC208794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = TreeWalker.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC308794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TreeWalker.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC408794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TreeShared.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC508794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = TypeInfo.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC608794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = TypeInfo.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC708794ABF00677359 = {
  -			children = (
  -				A8212FC808794ABF00677359,
  -				A8212FC908794ABF00677359,
  -				A8212FCA08794ABF00677359,
  -				A8212FCB08794ABF00677359,
  -				A8212FCC08794ABF00677359,
  -			);
  -			isa = PBXGroup;
  -			path = views;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC808794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = AbstractView.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FC908794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = AbstractView.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FCA08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentView.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FCB08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentView.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FCC08794ABF00677359 = {
  -			children = (
  -				A8212FCD08794ABF00677359,
  -				A8212FCE08794ABF00677359,
  -				A8212FCF08794ABF00677359,
  -				A8212FD008794ABF00677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FCD08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = AbstractViewImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FCE08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = AbstractViewImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FCF08794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = DocumentViewImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FD008794ABF00677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = DocumentViewImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FF208794AC000677359 = {
  -			children = (
  -				A8212FF308794AC000677359,
  -				A821305D08794AC000677359,
  -				A821306008794AC100677359,
  -				A821306108794AC100677359,
  -				A821306208794AC100677359,
  -				A821306308794AC100677359,
  -				A821306408794AC100677359,
  -				A821306508794AC100677359,
  -				A821306608794AC100677359,
  -				A821306708794AC100677359,
  -				A821306808794AC100677359,
  -				A821306908794AC100677359,
  -				A821306A08794AC100677359,
  -				A821306B08794AC100677359,
  -			);
  -			isa = PBXGroup;
  -			path = xpath;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FF308794AC000677359 = {
  -			children = (
  -				A8212FF408794AC000677359,
  -				A8212FF508794AC000677359,
  -				A8212FF608794AC000677359,
  -				A8212FF708794AC000677359,
  -				A8212FF808794AC000677359,
  -				A821300408794AC000677359,
  -				A821300508794AC000677359,
  -				A821300608794AC000677359,
  -				A821300708794AC000677359,
  -				A821302F08794AC000677359,
  -				A821303008794AC000677359,
  -				A821303208794AC000677359,
  -				A821303308794AC000677359,
  -				A821303408794AC000677359,
  -				A821303D08794AC000677359,
  -				A821303E08794AC000677359,
  -				A821303F08794AC000677359,
  -				A821304008794AC000677359,
  -				A821304108794AC000677359,
  -				A821304508794AC000677359,
  -				A821304608794AC000677359,
  -				A821304708794AC000677359,
  -				A821304808794AC000677359,
  -				A821304908794AC000677359,
  -				A821304A08794AC000677359,
  -				A821304B08794AC000677359,
  -				A821304C08794AC000677359,
  -				A821304D08794AC000677359,
  -				A821304E08794AC000677359,
  -				A821304F08794AC000677359,
  -				A821305008794AC000677359,
  -				A821305108794AC000677359,
  -				A821305208794AC000677359,
  -				A821305308794AC000677359,
  -				A821305408794AC000677359,
  -				A821305508794AC000677359,
  -				A821305608794AC000677359,
  -				A821305708794AC000677359,
  -				A821305808794AC000677359,
  -				A821305908794AC000677359,
  -				A821305A08794AC000677359,
  -				A821305B08794AC000677359,
  -				A821305C08794AC000677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FF408794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = AxisImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FF508794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = AxisImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FF608794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ContextImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FF708794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ContextImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FF808794AC000677359 = {
  -			children = (
  -				A8212FF908794AC000677359,
  -				A8212FFA08794AC000677359,
  -				A8212FFC08794AC000677359,
  -				A8212FFD08794AC000677359,
  -				A8212FFE08794AC000677359,
  -				A8212FFF08794AC000677359,
  -				A821300008794AC000677359,
  -				A821300108794AC000677359,
  -				A821300208794AC000677359,
  -				A821300308794AC000677359,
  -			);
  -			isa = PBXGroup;
  -			path = data;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FF908794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = BooleanImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FFA08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = BooleanImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FFC08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NodeSetImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FFD08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NodeSetImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FFE08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NumberImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A8212FFF08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NumberImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300008794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = StringImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300108794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = StringImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300208794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ValueImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300308794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ValueImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300408794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ExprNodeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300508794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ExprNodeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300608794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = FILES;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300708794AC000677359 = {
  -			children = (
  -				A821300808794AC000677359,
  -				A821300908794AC000677359,
  -				A821300A08794AC000677359,
  -				A821300B08794AC000677359,
  -				A821300C08794AC000677359,
  -				A821300D08794AC000677359,
  -				A821300E08794AC000677359,
  -				A821300F08794AC000677359,
  -				A821301008794AC000677359,
  -				A821301108794AC000677359,
  -				A821301208794AC000677359,
  -				A821301308794AC000677359,
  -				A821301408794AC000677359,
  -				A821301508794AC000677359,
  -				A821301708794AC000677359,
  -				A821301808794AC000677359,
  -				A821301908794AC000677359,
  -				A821301A08794AC000677359,
  -				A821301B08794AC000677359,
  -				A821301C08794AC000677359,
  -				A821301D08794AC000677359,
  -				A821301E08794AC000677359,
  -				A821301F08794AC000677359,
  -				A821302008794AC000677359,
  -				A821302108794AC000677359,
  -				A821302208794AC000677359,
  -				A821302308794AC000677359,
  -				A821302408794AC000677359,
  -				A821302508794AC000677359,
  -				A821302608794AC000677359,
  -				A821302708794AC000677359,
  -				A821302808794AC000677359,
  -				A821302908794AC000677359,
  -				A821302A08794AC000677359,
  -				A821302B08794AC000677359,
  -				A821302D08794AC000677359,
  -				A821302E08794AC000677359,
  -			);
  -			isa = PBXGroup;
  -			path = functions1;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300808794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = boolean_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300908794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = boolean_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300A08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ceiling_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300B08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ceiling_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300C08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = concat_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300D08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = concat_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300E08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = contains_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821300F08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = contains_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301008794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = false_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301108794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = false_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301208794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = floor_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301308794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = floor_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301408794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = FunctionCallImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301508794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = FunctionCallImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301708794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = "normalize-space_fnxp1.cc";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301808794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = "normalize-space_fnxp1.h";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301908794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = not_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301A08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = not_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301B08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = number_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301C08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = number_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301D08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = README;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301E08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = round_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821301F08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = round_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302008794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = "starts-with_fnxp1.cc";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302108794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = "starts-with_fnxp1.h";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302208794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = "string-length_fnxp1.cc";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302308794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = "string-length_fnxp1.h";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302408794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = string_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302508794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = string_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302608794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = "substring-after_fnxp1.cc";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302708794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = "substring-after_fnxp1.h";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302808794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = "substring-before_fnxp1.cc";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302908794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = "substring-before_fnxp1.h";
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302A08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = substring_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302B08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = substring_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302D08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = true_fnxp1.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302E08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = true_fnxp1.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821302F08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = LiteralImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303008794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = LiteralImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303208794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = OperatorImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303308794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = OperatorImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303408794AC000677359 = {
  -			children = (
  -				A821303508794AC000677359,
  -				A821303608794AC000677359,
  -				A821303708794AC000677359,
  -				A821303A08794AC000677359,
  -				A821303B08794AC000677359,
  -				A821303C08794AC000677359,
  -			);
  -			isa = PBXGroup;
  -			path = parser;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303508794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Lexer.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303608794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Lexer.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303708794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.lex;
  -			path = Lexer.l;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303A08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ParserState.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303B08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ParserState.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303C08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.yacc;
  -			path = xpath.ypp;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303D08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ScopeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303E08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ScopeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821303F08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = StepImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304008794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = StepImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304108794AC000677359 = {
  -			children = (
  -				A821304308794AC000677359,
  -				A821304408794AC000677359,
  -			);
  -			isa = PBXGroup;
  -			path = utils;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304308794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = QNameImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304408794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = QNameImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304508794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = VariableRefImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304608794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = VariableRefImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304708794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathCustomExceptionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304808794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathCustomExceptionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304908794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathEvaluatorImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304A08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathEvaluatorImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304B08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathExceptionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304C08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathExceptionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304D08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathExpressionFilterImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304E08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathExpressionFilterImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821304F08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathExpressionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305008794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathExpressionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305108794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathFactory1Impl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305208794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathFactory1Impl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305308794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathFactoryBaseImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305408794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathFactoryBaseImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305508794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathHelper.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305608794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathHelper.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305708794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathNamespaceImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305808794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathNamespaceImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305908794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathNSResolverImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305A08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathNSResolverImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305B08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathResultImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305C08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathResultImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821305D08794AC000677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = kdomxpath.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306008794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathEvaluator.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306108794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathEvaluator.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306208794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathException.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306308794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathException.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306408794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathExpression.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306508794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathExpression.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306608794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathNamespace.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306708794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathNamespace.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306808794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathNSResolver.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306908794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathNSResolver.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306A08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPathResult.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306B08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPathResult.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306C08794AC100677359 = {
  -			children = (
  -				A821306D08794AC100677359,
  -				A821308508794AC100677359,
  -				A821308B08794AC100677359,
  -				A821308C08794AC100677359,
  -				A821308D08794AC100677359,
  -				A821308E08794AC100677359,
  -				A821308F08794AC100677359,
  -				A821309008794AC100677359,
  -				A821309108794AC100677359,
  -				A821309208794AC100677359,
  -				A821309308794AC100677359,
  -				A821309408794AC100677359,
  -			);
  -			isa = PBXGroup;
  -			path = xpointer;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306D08794AC100677359 = {
  -			children = (
  -				A821306E08794AC100677359,
  -				A821306F08794AC100677359,
  -				A821307108794AC100677359,
  -				A821307208794AC100677359,
  -				A821307308794AC100677359,
  -				A821307408794AC100677359,
  -				A821307508794AC100677359,
  -				A821307608794AC100677359,
  -				A821307708794AC100677359,
  -				A821307808794AC100677359,
  -				A821307908794AC100677359,
  -				A821307A08794AC100677359,
  -				A821307B08794AC100677359,
  -				A821307C08794AC100677359,
  -				A821307D08794AC100677359,
  -				A821307E08794AC100677359,
  -				A821307F08794AC100677359,
  -				A821308008794AC100677359,
  -				A821308108794AC100677359,
  -				A821308208794AC100677359,
  -				A821308308794AC100677359,
  -				A821308408794AC100677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306E08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ElementSchemeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821306F08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ElementSchemeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307108794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = NBCImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307208794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = NBCImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307308794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = PointerPartImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307408794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = PointerPartImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307508794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = ShortHandImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307608794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ShortHandImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307708794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XMLNSSchemeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307808794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XMLNSSchemeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307908794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPath1SchemeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307A08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPath1SchemeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307B08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerEvaluatorImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307C08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerEvaluatorImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307D08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerExceptionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307E08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerExceptionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821307F08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerExpressionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308008794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerExpressionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308108794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerResultImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308208794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerResultImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308308794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerSchemeImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308408794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerSchemeImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308508794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = kdomxpointer.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308B08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerEvaluator.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308C08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerEvaluator.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308D08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerException.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308E08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerException.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821308F08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerExpression.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309008794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerExpression.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309108794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerHelper.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309208794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerHelper.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309308794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = XPointerResult.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309408794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = XPointerResult.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309508794AC100677359 = {
  -			children = (
  -				A821309608794AC100677359,
  -				A821309F08794AC100677359,
  -				A82130B308794AC100677359,
  -				A82130BA08794AC200677359,
  -				A821319A08794AC400677359,
  -				A82131A408794AC400677359,
  -				A82131B108794AC400677359,
  -				A82132A308794AC600677359,
  -				A82132A408794AC600677359,
  -				A82132A508794AC600677359,
  -				A82132A608794AC600677359,
  -				A82132A708794AC600677359,
  -				A82132A808794AC600677359,
  -				A82132A908794AC600677359,
  -				A82132AA08794AC600677359,
  -				A82132AB08794AC600677359,
  -				A82132AC08794AC600677359,
  -			);
  -			isa = PBXGroup;
  -			path = ksvg2;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309608794AC100677359 = {
  -			children = (
  -				A821309708794AC100677359,
  -				A821309808794AC100677359,
  -				A821309908794AC100677359,
  -				A821309A08794AC100677359,
  -				A821309B08794AC100677359,
  -				A821309C08794AC100677359,
  -			);
  -			isa = PBXGroup;
  -			path = core;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309708794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KCanvasRenderingStyle.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309808794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KCanvasRenderingStyle.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309908794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KSVGDocumentBuilder.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309A08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KSVGDocumentBuilder.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309B08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KSVGTimeScheduler.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309C08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KSVGTimeScheduler.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821309F08794AC100677359 = {
  -			children = (
  -				A82130A108794AC100677359,
  -			);
  -			isa = PBXGroup;
  -			path = css;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130A108794AC100677359 = {
  -			children = (
  -				A82130A208794AC100677359,
  -				A82130A308794AC100677359,
  -				A82130A408794AC100677359,
  -				A82130A508794AC100677359,
  -				A82130A708794AC100677359,
  -				A82130A808794AC100677359,
  -				A82130A908794AC100677359,
  -				A82130AA08794AC100677359,
  -				A82130AB08794AC100677359,
  -				A82130AC08794AC100677359,
  -				A82130AD08794AC100677359,
  -				A82130AE08794AC100677359,
  -				A82130AF08794AC100677359,
  -				A82130B008794AC100677359,
  -				A82130B108794AC100677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130A208794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KSVGCSSParser.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130A308794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KSVGCSSParser.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130A408794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = cssproperties.in;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130A508794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = cssvalues.in;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130A708794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = svg.css;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130A808794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGCSSStyleDeclarationImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130A908794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGCSSStyleDeclarationImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130AA08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGCSSStyleSelector.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130AB08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGCSSStyleSelector.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130AC08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGCSSStyleSheetImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130AD08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGCSSStyleSheetImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130AE08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGRenderStyle.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130AF08794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGRenderStyle.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130B008794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGRenderStyleDefs.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130B108794AC100677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGRenderStyleDefs.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130B308794AC100677359 = {
  -			children = (
  -				A82130B408794AC200677359,
  -				A82130B508794AC200677359,
  -				A82130B608794AC200677359,
  -				A82130B708794AC200677359,
  -				A82130B908794AC200677359,
  -			);
  -			isa = PBXGroup;
  -			path = data;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130B408794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CSSConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130B508794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EcmaConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130B608794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EventsConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130B708794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = generateddata.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130B908794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGConstants.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130BA08794AC200677359 = {
  -			children = (
  -				A82130BC08794AC200677359,
  -				A82130BD08794AC200677359,
  -				A82130BE08794AC200677359,
  -				A82130BF08794AC200677359,
  -				A82130C008794AC200677359,
  -				A82130C108794AC200677359,
  -				A82130C208794AC200677359,
  -				A82130C308794AC200677359,
  -				A82130C408794AC200677359,
  -				A82130C508794AC200677359,
  -				A82130C608794AC200677359,
  -				A82130C708794AC200677359,
  -				A82130C808794AC200677359,
  -				A82130C908794AC200677359,
  -				A82130CA08794AC200677359,
  -				A82130CB08794AC200677359,
  -				A82130CC08794AC200677359,
  -				A82130CD08794AC200677359,
  -				A82130CE08794AC200677359,
  -				A82130CF08794AC200677359,
  -				A82130D008794AC200677359,
  -				A82130D108794AC200677359,
  -				A82130D208794AC200677359,
  -				A82130D308794AC200677359,
  -				A82130D408794AC200677359,
  -				A82130D508794AC200677359,
  -				A82130D608794AC200677359,
  -				A82130D708794AC200677359,
  -				A82130D808794AC200677359,
  -				A82130D908794AC200677359,
  -				A82130DA08794AC200677359,
  -				A82130DB08794AC200677359,
  -				A82130DC08794AC200677359,
  -				A82130DD08794AC200677359,
  -				A82130DE08794AC200677359,
  -				A82130DF08794AC200677359,
  -				A82130E008794AC200677359,
  -				A82130E108794AC200677359,
  -				A82130E208794AC200677359,
  -				A82130E308794AC200677359,
  -				A82130E408794AC200677359,
  -				A82130E508794AC200677359,
  -				A82130E608794AC200677359,
  -				A82130E708794AC200677359,
  -				A82130E808794AC200677359,
  -				A82130E908794AC200677359,
  -				A82130EA08794AC200677359,
  -				A82130EB08794AC200677359,
  -				A82130EC08794AC200677359,
  -				A82130ED08794AC200677359,
  -				A82130EE08794AC200677359,
  -				A82130EF08794AC200677359,
  -				A82130F008794AC200677359,
  -				A82130F108794AC200677359,
  -				A82130F208794AC200677359,
  -				A82130F308794AC200677359,
  -				A82130F408794AC200677359,
  -				A82130F508794AC200677359,
  -				A82130F608794AC200677359,
  -				A82130F708794AC200677359,
  -				A82130F808794AC200677359,
  -				A82130F908794AC200677359,
  -				A82130FA08794AC200677359,
  -				A82130FB08794AC200677359,
  -				A82130FC08794AC200677359,
  -				A82130FD08794AC200677359,
  -				A82130FE08794AC200677359,
  -				A82130FF08794AC200677359,
  -				A821310008794AC200677359,
  -				A821310108794AC200677359,
  -				A821310208794AC200677359,
  -				A821310308794AC200677359,
  -				A821310408794AC200677359,
  -				A821310508794AC200677359,
  -				A821310608794AC200677359,
  -				A821310708794AC200677359,
  -				A821310808794AC200677359,
  -				A821310908794AC200677359,
  -				A821310A08794AC200677359,
  -				A821310B08794AC200677359,
  -				A821310C08794AC200677359,
  -				A821310D08794AC200677359,
  -				A821310E08794AC200677359,
  -				A821310F08794AC200677359,
  -				A821311008794AC200677359,
  -				A821311108794AC200677359,
  -				A821311208794AC200677359,
  -				A821311308794AC200677359,
  -				A821311408794AC200677359,
  -				A821311508794AC200677359,
  -				A821311608794AC200677359,
  -				A821311708794AC200677359,
  -				A821311808794AC200677359,
  -				A821311908794AC200677359,
  -				A821311A08794AC200677359,
  -				A821311B08794AC200677359,
  -				A821311C08794AC300677359,
  -				A821311D08794AC300677359,
  -				A821311E08794AC300677359,
  -				A821311F08794AC300677359,
  -				A821312008794AC300677359,
  -				A821312108794AC300677359,
  -				A821312208794AC300677359,
  -				A821312308794AC300677359,
  -				A821312408794AC300677359,
  -				A821312508794AC300677359,
  -				A821312608794AC300677359,
  -				A821312708794AC300677359,
  -				A821312808794AC300677359,
  -				A821312908794AC300677359,
  -				A821312A08794AC300677359,
  -				A821312B08794AC300677359,
  -				A821312C08794AC300677359,
  -				A821312D08794AC300677359,
  -				A821312E08794AC300677359,
  -				A821312F08794AC300677359,
  -				A821313008794AC300677359,
  -				A821313108794AC300677359,
  -				A821313208794AC300677359,
  -				A821313308794AC300677359,
  -				A821313408794AC300677359,
  -				A821313508794AC300677359,
  -				A821313608794AC300677359,
  -				A821313708794AC300677359,
  -				A821313808794AC300677359,
  -				A821313908794AC300677359,
  -				A821313A08794AC300677359,
  -				A821313B08794AC300677359,
  -				A821313C08794AC300677359,
  -				A821313D08794AC300677359,
  -				A821313E08794AC300677359,
  -				A821313F08794AC300677359,
  -				A821314008794AC300677359,
  -				A821314108794AC300677359,
  -				A821314208794AC300677359,
  -				A821314308794AC300677359,
  -				A821314408794AC300677359,
  -				A821314508794AC300677359,
  -				A821314608794AC300677359,
  -				A821314708794AC300677359,
  -				A821314808794AC300677359,
  -				A821314908794AC300677359,
  -				A821314A08794AC300677359,
  -				A821314B08794AC300677359,
  -				A821314C08794AC300677359,
  -				A821314D08794AC300677359,
  -				A821314E08794AC300677359,
  -				A821314F08794AC300677359,
  -				A821315008794AC300677359,
  -				A821315108794AC300677359,
  -				A821315208794AC300677359,
  -				A821315308794AC300677359,
  -				A821315408794AC300677359,
  -				A821315508794AC300677359,
  -				A821315608794AC300677359,
  -				A821315708794AC300677359,
  -				A821315808794AC300677359,
  -				A821315908794AC300677359,
  -				A821315A08794AC300677359,
  -				A821315B08794AC300677359,
  -				A821315C08794AC300677359,
  -				A821315D08794AC300677359,
  -				A821315E08794AC300677359,
  -				A821315F08794AC300677359,
  -				A821316008794AC300677359,
  -				A821316108794AC300677359,
  -				A821316208794AC300677359,
  -				A821316308794AC300677359,
  -				A821316408794AC300677359,
  -				A821316508794AC300677359,
  -				A821316608794AC300677359,
  -				A821316708794AC300677359,
  -				A821316808794AC300677359,
  -				A821316908794AC300677359,
  -				A821316A08794AC300677359,
  -				A821316B08794AC300677359,
  -				A821316C08794AC300677359,
  -				A821316D08794AC300677359,
  -				A821316E08794AC300677359,
  -				A821316F08794AC300677359,
  -				A821317008794AC300677359,
  -				A821317108794AC300677359,
  -				A821317208794AC300677359,
  -				A821317308794AC300677359,
  -				A821317408794AC300677359,
  -				A821317508794AC300677359,
  -				A821317608794AC300677359,
  -				A821317708794AC300677359,
  -				A821317808794AC300677359,
  -				A821317908794AC300677359,
  -				A821317A08794AC300677359,
  -				A821317B08794AC300677359,
  -				A821317C08794AC300677359,
  -				A821317D08794AC300677359,
  -				A821317E08794AC300677359,
  -				A821317F08794AC300677359,
  -				A821318008794AC300677359,
  -				A821318108794AC300677359,
  -				A821318208794AC300677359,
  -				A821318308794AC300677359,
  -				A821318408794AC300677359,
  -				A821318508794AC300677359,
  -				A821318608794AC300677359,
  -				A821318708794AC300677359,
  -				A821318808794AC300677359,
  -				A821318908794AC300677359,
  -				A821318A08794AC300677359,
  -				A821318B08794AC300677359,
  -				A821318C08794AC300677359,
  -				A821318D08794AC300677359,
  -				A821318E08794AC300677359,
  -				A821318F08794AC300677359,
  -				A821319008794AC300677359,
  -				A821319108794AC300677359,
  -				A821319208794AC300677359,
  -				A821319308794AC300677359,
  -				A821319408794AC400677359,
  -				A821319508794AC400677359,
  -				A821319608794AC400677359,
  -				A821319708794AC400677359,
  -				A821319808794AC400677359,
  -				A821319908794AC400677359,
  -			);
  -			isa = PBXGroup;
  -			path = dom;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130BC08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130BD08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130BE08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAngle.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130BF08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAngle.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C008794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimateColorElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C108794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimateColorElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C208794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedAngle.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C308794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedAngle.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C408794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedBoolean.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C508794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedBoolean.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C608794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedEnumeration.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C708794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedEnumeration.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C808794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedInteger.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130C908794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedInteger.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130CA08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedLength.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130CB08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedLength.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130CC08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedLengthList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130CD08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedLengthList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130CE08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedNumber.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130CF08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedNumber.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D008794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedNumberList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D108794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedNumberList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D208794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedPathData.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D308794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedPathData.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D408794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedPoints.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D508794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedPoints.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D608794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedPreserveAspectRatio.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D708794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedPreserveAspectRatio.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D808794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedRect.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130D908794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedRect.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130DA08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedString.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130DB08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedString.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130DC08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedTransformList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130DD08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedTransformList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130DE08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimateElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130DF08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimateElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E008794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimateTransformElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E108794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimateTransformElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E208794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimationElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E308794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimationElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E408794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGCircleElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E508794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGCircleElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E608794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGClipPathElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E708794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGClipPathElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E808794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGColor.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130E908794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGColor.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130EA08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGComponentTransferFunctionElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130EB08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGComponentTransferFunctionElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130EC08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGDefsElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130ED08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGDefsElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130EE08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGDescElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130EF08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGDescElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F008794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGDocument.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F108794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGDocument.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F208794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGDOMImplementation.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F308794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGDOMImplementation.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F408794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F508794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F608794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGElementInstance.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F708794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGElementInstance.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F808794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGElementInstanceList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130F908794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGElementInstanceList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130FA08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGEllipseElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130FB08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGEllipseElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130FC08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGException.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130FD08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGException.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130FE08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGExternalResourcesRequired.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82130FF08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGExternalResourcesRequired.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310008794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEBlendElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310108794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEBlendElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310208794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEColorMatrixElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310308794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEColorMatrixElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310408794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEComponentTransferElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310508794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEComponentTransferElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310608794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFECompositeElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310708794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFECompositeElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310808794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFloodElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310908794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFloodElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310A08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFuncAElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310B08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFuncAElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310C08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFuncBElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310D08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFuncBElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310E08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFuncGElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821310F08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFuncGElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311008794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFuncRElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311108794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFuncRElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311208794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEGaussianBlurElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311308794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEGaussianBlurElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311408794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEImageElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311508794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEImageElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311608794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEMergeElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311708794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEMergeElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311808794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEMergeNodeElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311908794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEMergeNodeElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311A08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEOffsetElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311B08794AC200677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEOffsetElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311C08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFETileElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311D08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFETileElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311E08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFETurbulenceElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821311F08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFETurbulenceElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312008794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFilterElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312108794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFilterElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312208794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFilterPrimitiveStandardAttributes.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312308794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFilterPrimitiveStandardAttributes.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312408794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFitToViewBox.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312508794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFitToViewBox.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312608794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGGElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312708794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGGElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312808794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGGradientElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312908794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGGradientElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312A08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGImageElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312B08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGImageElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312C08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLangSpace.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312D08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLangSpace.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312E08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLength.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821312F08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLength.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313008794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLengthList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313108794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLengthList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313208794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLinearGradientElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313308794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLinearGradientElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313408794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLineElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313508794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLineElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313608794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLocatable.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313708794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLocatable.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313808794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGMarkerElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313908794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGMarkerElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313A08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGMatrix.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313B08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGMatrix.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313C08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGNumber.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313D08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGNumber.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313E08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGNumberList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821313F08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGNumberList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314008794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPaint.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314108794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPaint.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314208794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314308794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314408794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSeg.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314508794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSeg.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314608794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegArc.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314708794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegArc.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314808794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegClosePath.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314908794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegClosePath.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314A08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegCurvetoCubic.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314B08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegCurvetoCubic.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314C08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegCurvetoCubicSmooth.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314D08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegCurvetoCubicSmooth.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314E08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegCurvetoQuadratic.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821314F08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegCurvetoQuadratic.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315008794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegCurvetoQuadraticSmooth.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315108794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegCurvetoQuadraticSmooth.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315208794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegLineto.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315308794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegLineto.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315408794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegLinetoHorizontal.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315508794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegLinetoHorizontal.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315608794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegLinetoVertical.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315708794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegLinetoVertical.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315808794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315908794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315A08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegMoveto.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315B08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegMoveto.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315C08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPatternElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315D08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPatternElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315E08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPoint.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821315F08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPoint.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316008794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPointList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316108794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPointList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316208794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPolygonElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316308794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPolygonElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316408794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPolylineElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316508794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPolylineElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316608794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPreserveAspectRatio.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316708794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPreserveAspectRatio.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316808794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGRadialGradientElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316908794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGRadialGradientElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316A08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGRect.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316B08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGRect.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316C08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGRectElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316D08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGRectElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316E08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGScriptElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821316F08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGScriptElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317008794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGSetElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317108794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGSetElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317208794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStopElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317308794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStopElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317408794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStringList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317508794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStringList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317608794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStylable.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317708794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStylable.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317808794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStyleElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317908794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStyleElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317A08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGSVGElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317B08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGSVGElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317C08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGSwitchElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317D08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGSwitchElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317E08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGSymbolElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821317F08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGSymbolElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318008794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTests.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318108794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTests.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318208794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTextContentElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318308794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTextContentElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318408794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTextElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318508794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTextElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318608794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTextPositioningElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318708794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTextPositioningElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318808794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTitleElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318908794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTitleElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318A08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTransform.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318B08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTransform.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318C08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTransformable.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318D08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTransformable.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318E08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTransformList.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821318F08794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTransformList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319008794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTSpanElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319108794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTSpanElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319208794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGURIReference.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319308794AC300677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGURIReference.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319408794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGUseElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319508794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGUseElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319608794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGViewElement.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319708794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGViewElement.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319808794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGZoomAndPan.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319908794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGZoomAndPan.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319A08794AC400677359 = {
  -			children = (
  -				A821319B08794AC400677359,
  -				A821319C08794AC400677359,
  -				A821319D08794AC400677359,
  -				A821319E08794AC400677359,
  -				A821319F08794AC400677359,
  -				A82131A008794AC400677359,
  -				A82131A108794AC400677359,
  -				A82131A308794AC400677359,
  -			);
  -			isa = PBXGroup;
  -			path = ecma;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319B08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Constructors.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319C08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Constructors.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319D08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = Ecma.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319E08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = Ecma.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821319F08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = EcmaInterface.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131A008794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = GlobalObject.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131A108794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = GlobalObject.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131A308794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLookup.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131A408794AC400677359 = {
  -			children = (
  -				A82131A508794AC400677359,
  -				A82131AB08794AC400677359,
  -				A82131AD08794AC400677359,
  -				A82131AE08794AC400677359,
  -				A82131AF08794AC400677359,
  -				A82131B008794AC400677359,
  -			);
  -			isa = PBXGroup;
  -			path = events;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131A508794AC400677359 = {
  -			children = (
  -				A82131A708794AC400677359,
  -				A82131A808794AC400677359,
  -				A82131A908794AC400677359,
  -				A82131AA08794AC400677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131A708794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGEventImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131A808794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGEventImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131A908794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGZoomEventImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131AA08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGZoomEventImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131AB08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ksvgevents.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131AD08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGEvent.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131AE08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGEvent.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131AF08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGZoomEvent.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B008794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGZoomEvent.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B108794AC400677359 = {
  -			children = (
  -				A82131B208794AC400677359,
  -				A82131B308794AC400677359,
  -				A82131B508794AC400677359,
  -				A82131B608794AC400677359,
  -				A82131B708794AC400677359,
  -				A82131B808794AC400677359,
  -				A82131B908794AC400677359,
  -				A82131BA08794AC400677359,
  -				A82131BB08794AC400677359,
  -				A82131BC08794AC400677359,
  -				A82131BD08794AC400677359,
  -				A82131BE08794AC400677359,
  -				A82131BF08794AC400677359,
  -				A82131C008794AC400677359,
  -				A82131C108794AC400677359,
  -				A82131C208794AC400677359,
  -				A82131C308794AC400677359,
  -				A82131C408794AC400677359,
  -				A82131C508794AC400677359,
  -				A82131C608794AC400677359,
  -				A82131C708794AC400677359,
  -				A82131C808794AC400677359,
  -				A82131C908794AC400677359,
  -				A82131CA08794AC400677359,
  -				A82131CB08794AC400677359,
  -				A82131CC08794AC400677359,
  -				A82131CD08794AC400677359,
  -				A82131CE08794AC400677359,
  -				A82131CF08794AC400677359,
  -				A82131D008794AC400677359,
  -				A82131D108794AC400677359,
  -				A82131D208794AC400677359,
  -				A82131D308794AC400677359,
  -				A82131D408794AC400677359,
  -				A82131D508794AC400677359,
  -				A82131D608794AC400677359,
  -				A82131D708794AC400677359,
  -				A82131D808794AC400677359,
  -				A82131D908794AC400677359,
  -				A82131DA08794AC400677359,
  -				A82131DB08794AC400677359,
  -				A82131DC08794AC400677359,
  -				A82131DD08794AC400677359,
  -				A82131DE08794AC400677359,
  -				A82131DF08794AC400677359,
  -				A82131E008794AC400677359,
  -				A82131E108794AC400677359,
  -				A82131E208794AC400677359,
  -				A82131E308794AC400677359,
  -				A82131E408794AC400677359,
  -				A82131E508794AC400677359,
  -				A82131E608794AC400677359,
  -				A82131E708794AC400677359,
  -				A82131E808794AC400677359,
  -				A82131E908794AC400677359,
  -				A82131EA08794AC400677359,
  -				A82131EB08794AC400677359,
  -				A82131EC08794AC400677359,
  -				A82131ED08794AC400677359,
  -				A82131EE08794AC500677359,
  -				A82131EF08794AC500677359,
  -				A82131F008794AC500677359,
  -				A82131F108794AC500677359,
  -				A82131F208794AC500677359,
  -				A82131F308794AC500677359,
  -				A82131F408794AC500677359,
  -				A82131F508794AC500677359,
  -				A82131F608794AC500677359,
  -				A82131F708794AC500677359,
  -				A82131F808794AC500677359,
  -				A82131F908794AC500677359,
  -				A82131FA08794AC500677359,
  -				A82131FB08794AC500677359,
  -				A82131FC08794AC500677359,
  -				A82131FD08794AC500677359,
  -				A82131FE08794AC500677359,
  -				A82131FF08794AC500677359,
  -				A821320008794AC500677359,
  -				A821320108794AC500677359,
  -				A821320208794AC500677359,
  -				A821320308794AC500677359,
  -				A821320408794AC500677359,
  -				A821320508794AC500677359,
  -				A821320608794AC500677359,
  -				A821320708794AC500677359,
  -				A821320808794AC500677359,
  -				A821320908794AC500677359,
  -				A821320A08794AC500677359,
  -				A821320B08794AC500677359,
  -				A821320C08794AC500677359,
  -				A821320D08794AC500677359,
  -				A821320E08794AC500677359,
  -				A821320F08794AC500677359,
  -				A821321008794AC500677359,
  -				A821321108794AC500677359,
  -				A821321208794AC500677359,
  -				A821321308794AC500677359,
  -				A821321408794AC500677359,
  -				A821321508794AC500677359,
  -				A821321608794AC500677359,
  -				A821321708794AC500677359,
  -				A821321808794AC500677359,
  -				A821321908794AC500677359,
  -				A821321A08794AC500677359,
  -				A821321B08794AC500677359,
  -				A821321C08794AC500677359,
  -				A821321D08794AC500677359,
  -				A821321E08794AC500677359,
  -				A821321F08794AC500677359,
  -				A821322008794AC500677359,
  -				A821322108794AC500677359,
  -				A821322208794AC500677359,
  -				A821322308794AC500677359,
  -				A821322408794AC500677359,
  -				A821322508794AC500677359,
  -				A821322608794AC500677359,
  -				A821322708794AC500677359,
  -				A821322808794AC500677359,
  -				A821322908794AC500677359,
  -				A821322A08794AC500677359,
  -				A821322B08794AC500677359,
  -				A821322C08794AC500677359,
  -				A821322D08794AC500677359,
  -				A821322E08794AC500677359,
  -				A821322F08794AC500677359,
  -				A821323008794AC500677359,
  -				A821323108794AC500677359,
  -				A821323208794AC500677359,
  -				A821323308794AC500677359,
  -				A821323408794AC500677359,
  -				A821323508794AC500677359,
  -				A821323608794AC500677359,
  -				A821323708794AC500677359,
  -				A821323808794AC500677359,
  -				A821323908794AC500677359,
  -				A821323A08794AC500677359,
  -				A821323B08794AC500677359,
  -				A821323C08794AC500677359,
  -				A821323D08794AC500677359,
  -				A821323E08794AC500677359,
  -				A821323F08794AC500677359,
  -				A821324008794AC500677359,
  -				A821324108794AC500677359,
  -				A821324208794AC500677359,
  -				A821324308794AC500677359,
  -				A821324408794AC500677359,
  -				A821324508794AC500677359,
  -				A821324608794AC500677359,
  -				A821324708794AC500677359,
  -				A821324808794AC500677359,
  -				A821324908794AC500677359,
  -				A821324A08794AC500677359,
  -				A821324B08794AC500677359,
  -				A821324C08794AC500677359,
  -				A821324D08794AC500677359,
  -				A821324E08794AC500677359,
  -				A821324F08794AC500677359,
  -				A821325008794AC500677359,
  -				A821325108794AC500677359,
  -				A821325208794AC500677359,
  -				A821325308794AC500677359,
  -				A821325408794AC500677359,
  -				A821325508794AC500677359,
  -				A821325608794AC500677359,
  -				A821325708794AC500677359,
  -				A821325808794AC500677359,
  -				A821325908794AC500677359,
  -				A821325A08794AC500677359,
  -				A821325B08794AC500677359,
  -				A821325C08794AC500677359,
  -				A821325D08794AC500677359,
  -				A821325E08794AC500677359,
  -				A821325F08794AC500677359,
  -				A821326008794AC500677359,
  -				A821326108794AC500677359,
  -				A821326208794AC500677359,
  -				A821326308794AC500677359,
  -				A821326408794AC500677359,
  -				A821326508794AC500677359,
  -				A821326608794AC500677359,
  -				A821326708794AC500677359,
  -				A821326808794AC600677359,
  -				A821326908794AC600677359,
  -				A821326A08794AC600677359,
  -				A821326B08794AC600677359,
  -				A821326C08794AC600677359,
  -				A821326D08794AC600677359,
  -				A821326E08794AC600677359,
  -				A821326F08794AC600677359,
  -				A821327008794AC600677359,
  -				A821327108794AC600677359,
  -				A821327208794AC600677359,
  -				A821327308794AC600677359,
  -				A821327408794AC600677359,
  -				A821327508794AC600677359,
  -				A821327608794AC600677359,
  -				A821327708794AC600677359,
  -				A821327808794AC600677359,
  -				A821327908794AC600677359,
  -				A821327A08794AC600677359,
  -				A821327B08794AC600677359,
  -				A821327C08794AC600677359,
  -				A821327D08794AC600677359,
  -				A821327E08794AC600677359,
  -				A821327F08794AC600677359,
  -				A821328008794AC600677359,
  -				A821328108794AC600677359,
  -				A821328208794AC600677359,
  -				A821328308794AC600677359,
  -				A821328408794AC600677359,
  -				A821328508794AC600677359,
  -				A821328608794AC600677359,
  -				A821328708794AC600677359,
  -				A821328808794AC600677359,
  -				A821328908794AC600677359,
  -				A821328A08794AC600677359,
  -				A821328B08794AC600677359,
  -				A821328C08794AC600677359,
  -				A821328D08794AC600677359,
  -				A821328E08794AC600677359,
  -				A821328F08794AC600677359,
  -				A821329008794AC600677359,
  -				A821329108794AC600677359,
  -				A821329208794AC600677359,
  -				A821329308794AC600677359,
  -				A821329408794AC600677359,
  -				A821329508794AC600677359,
  -				A821329608794AC600677359,
  -				A821329708794AC600677359,
  -				A821329808794AC600677359,
  -				A821329908794AC600677359,
  -				A821329A08794AC600677359,
  -				A821329B08794AC600677359,
  -				A821329C08794AC600677359,
  -				A821329D08794AC600677359,
  -				A821329E08794AC600677359,
  -				A821329F08794AC600677359,
  -				A82132A008794AC600677359,
  -				A82132A108794AC600677359,
  -				A82132A208794AC600677359,
  -			);
  -			isa = PBXGroup;
  -			path = impl;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B208794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = CDFInterface.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B308794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = CDFInterface.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B508794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B608794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B708794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAngleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B808794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAngleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131B908794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimateColorElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131BA08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimateColorElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131BB08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedAngleImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131BC08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedAngleImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131BD08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedBooleanImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131BE08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedBooleanImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131BF08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedEnumerationImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C008794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedEnumerationImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C108794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedIntegerImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C208794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedIntegerImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C308794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedLengthImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C408794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedLengthImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C508794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedLengthListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C608794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedLengthListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C708794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedNumberImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C808794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedNumberImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131C908794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedNumberListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131CA08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedNumberListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131CB08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedPathDataImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131CC08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedPathDataImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131CD08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedPointsImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131CE08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedPointsImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131CF08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedPreserveAspectRatioImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D008794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedPreserveAspectRatioImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D108794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedRectImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D208794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedRectImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D308794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedStringImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D408794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedStringImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D508794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedTemplate.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D608794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimatedTransformListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D708794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimatedTransformListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D808794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimateElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131D908794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimateElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131DA08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimateTransformElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131DB08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimateTransformElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131DC08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGAnimationElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131DD08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGAnimationElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131DE08794AC400677359 = {
  -			explicitFileType = sourcecode.cpp.cpp;
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			path = svgattrs.c;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131DF08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = svgattrs.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E008794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = svgattrs.in;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E108794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGCircleElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E208794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGCircleElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E308794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGClipPathElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E408794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGClipPathElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E508794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGColorImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E608794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGColorImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E708794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGComponentTransferFunctionElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E808794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGComponentTransferFunctionElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131E908794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGDefsElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131EA08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGDefsElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131EB08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGDescElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131EC08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGDescElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131ED08794AC400677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGDocumentImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131EE08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGDocumentImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131EF08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGDOMImplementationImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F008794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGDOMImplementationImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F108794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F208794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F308794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGElementInstanceImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F408794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGElementInstanceImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F508794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGElementInstanceListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F608794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGElementInstanceListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F708794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGEllipseElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F808794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGEllipseElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131F908794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGExceptionImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131FA08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGExceptionImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131FB08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGExternalResourcesRequiredImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131FC08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGExternalResourcesRequiredImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131FD08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEBlendElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131FE08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEBlendElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82131FF08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEColorMatrixElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320008794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEColorMatrixElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320108794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEComponentTransferElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320208794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEComponentTransferElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320308794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFECompositeElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320408794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFECompositeElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320508794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFloodElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320608794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFloodElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320708794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFuncAElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320808794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFuncAElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320908794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFuncBElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320A08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFuncBElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320B08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFuncGElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320C08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFuncGElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320D08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEFuncRElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320E08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEFuncRElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821320F08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEGaussianBlurElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321008794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEGaussianBlurElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321108794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEImageElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321208794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEImageElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321308794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEMergeElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321408794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEMergeElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321508794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEMergeNodeElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321608794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEMergeNodeElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321708794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFEOffsetElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321808794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFEOffsetElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321908794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFETileElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321A08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFETileElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321B08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFETurbulenceElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321C08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFETurbulenceElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321D08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFilterElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321E08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFilterElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821321F08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFilterPrimitiveStandardAttributesImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322008794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFilterPrimitiveStandardAttributesImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322108794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGFitToViewBoxImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322208794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGFitToViewBoxImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322308794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGGElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322408794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGGElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322508794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGGradientElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322608794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGGradientElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322708794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGHelper.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322808794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGHelper.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322908794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGImageElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322A08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGImageElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322B08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLangSpaceImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322C08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLangSpaceImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322D08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLengthImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322E08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLengthImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821322F08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLengthListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323008794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLengthListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323108794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLinearGradientElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323208794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLinearGradientElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323308794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLineElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323408794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLineElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323508794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGList.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323608794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGLocatableImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323708794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGLocatableImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323808794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGMarkerElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323908794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGMarkerElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323A08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGMatrixImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323B08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGMatrixImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323C08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGNumberImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323D08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGNumberImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323E08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGNumberListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821323F08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGNumberListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324008794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPaintImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324108794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPaintImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324208794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324308794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324408794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = svgpathparser.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324508794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = svgpathparser.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324608794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegArcImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324708794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegArcImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324808794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegClosePathImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324908794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegClosePathImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324A08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegCurvetoCubicImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324B08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegCurvetoCubicImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324C08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegCurvetoCubicSmoothImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324D08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegCurvetoCubicSmoothImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324E08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegCurvetoQuadraticImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821324F08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegCurvetoQuadraticImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325008794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegCurvetoQuadraticSmoothImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325108794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegCurvetoQuadraticSmoothImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325208794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325308794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325408794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegLinetoHorizontalImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325508794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegLinetoHorizontalImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325608794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegLinetoImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325708794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegLinetoImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325808794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegLinetoVerticalImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325908794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegLinetoVerticalImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325A08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325B08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325C08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPathSegMovetoImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325D08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPathSegMovetoImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325E08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPatternElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821325F08794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPatternElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326008794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPointImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326108794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPointImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326208794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPointListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326308794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPointListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326408794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPolyElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326508794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPolyElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326608794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPolygonElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326708794AC500677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPolygonElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326808794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPolylineElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326908794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPolylineElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326A08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGPreserveAspectRatioImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326B08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGPreserveAspectRatioImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326C08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGRadialGradientElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326D08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGRadialGradientElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326E08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGRectElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821326F08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGRectElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327008794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGRectImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327108794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGRectImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327208794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGScriptElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327308794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGScriptElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327408794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGSetElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327508794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGSetElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327608794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStopElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327708794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStopElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327808794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStringListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327908794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStringListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327A08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStylableImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327B08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStylableImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327C08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStyledElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327D08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStyledElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327E08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGStyleElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821327F08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGStyleElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328008794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGSVGElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328108794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGSVGElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328208794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGSwitchElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328308794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGSwitchElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328408794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGSymbolElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328508794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGSymbolElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328608794AC600677359 = {
  -			explicitFileType = sourcecode.cpp.cpp;
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			path = svgtags.c;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328708794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = svgtags.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328808794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = text;
  -			path = svgtags.in;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328908794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTestsImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328A08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTestsImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328B08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTextContentElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328C08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTextContentElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328D08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTextElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328E08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTextElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821328F08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTextPositioningElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329008794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTextPositioningElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329108794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTitleElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329208794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTitleElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329308794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTransformableImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329408794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTransformableImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329508794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTransformImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329608794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTransformImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329708794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTransformListImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329808794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTransformListImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329908794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGTSpanElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329A08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGTSpanElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329B08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGURIReferenceImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329C08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGURIReferenceImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329D08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGUseElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329E08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGUseElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821329F08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGViewElementImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A008794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGViewElementImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A108794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = SVGZoomAndPanImpl.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A208794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = SVGZoomAndPanImpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A308794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = ksvg.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A408794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KSVGFactory.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A508794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KSVGFactory.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A608794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = KSVGSettings.cc;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A708794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KSVGSettings.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A808794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KSVGSlotStubs.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132A908794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KWQKSVGPart.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132AA08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KWQKSVGPart.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132AB08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KWQKSVGView.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A82132AC08794AC600677359 = {
  -			fileEncoding = 4;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KWQKSVGView.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A821416608794AF700677359 = {
  -			fileRef = A8212D3A08794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821416808794AF700677359 = {
  -			fileRef = A8212D3C08794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -				ATTRIBUTES = (
  -					Private,
  -				);
  -			};
  -		};
  -		A821416C08794AF700677359 = {
  -			fileRef = A8212D4008794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821416D08794AF700677359 = {
  -			fileRef = A8212D4108794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821416E08794AF700677359 = {
  -			fileRef = A8212D4208794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821416F08794AF700677359 = {
  -			fileRef = A8212D4308794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417008794AF700677359 = {
  -			fileRef = A8212D4408794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417108794AF700677359 = {
  -			fileRef = A8212D4508794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417208794AF700677359 = {
  -			fileRef = A8212D4608794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417308794AF700677359 = {
  -			fileRef = A8212D4708794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417408794AF700677359 = {
  -			fileRef = A8212D4808794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417508794AF700677359 = {
  -			fileRef = A8212D4908794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417608794AF700677359 = {
  -			fileRef = A8212D4A08794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417708794AF700677359 = {
  -			fileRef = A8212D4B08794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417808794AF700677359 = {
  -			fileRef = A8212D4C08794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417908794AF700677359 = {
  -			fileRef = A8212D4D08794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417A08794AF700677359 = {
  -			fileRef = A8212D4E08794AB400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417C08794AF700677359 = {
  -			fileRef = A8212D5108794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417D08794AF700677359 = {
  -			fileRef = A8212D5208794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417E08794AF700677359 = {
  -			fileRef = A8212D5308794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821417F08794AF700677359 = {
  -			fileRef = A8212D5408794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418008794AF700677359 = {
  -			fileRef = A8212D5508794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418108794AF700677359 = {
  -			fileRef = A8212D5608794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418208794AF700677359 = {
  -			fileRef = A8212D5708794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418408794AF700677359 = {
  -			fileRef = A8212D5908794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -				ATTRIBUTES = (
  -					Private,
  -				);
  -			};
  -		};
  -		A821418508794AF700677359 = {
  -			fileRef = A8212D5A08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418608794AF700677359 = {
  -			fileRef = A8212D5B08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418708794AF700677359 = {
  -			fileRef = A8212D5C08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418808794AF700677359 = {
  -			fileRef = A8212D5D08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418908794AF700677359 = {
  -			fileRef = A8212D5E08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418A08794AF700677359 = {
  -			fileRef = A8212D5F08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418B08794AF700677359 = {
  -			fileRef = A8212D6008794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418C08794AF700677359 = {
  -			fileRef = A8212D6108794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418D08794AF700677359 = {
  -			fileRef = A8212D6208794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418E08794AF700677359 = {
  -			fileRef = A8212D6308794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821418F08794AF700677359 = {
  -			fileRef = A8212D6408794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419008794AF700677359 = {
  -			fileRef = A8212D6508794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419108794AF700677359 = {
  -			fileRef = A8212D6608794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419208794AF700677359 = {
  -			fileRef = A8212D6708794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419308794AF700677359 = {
  -			fileRef = A8212D6808794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419408794AF700677359 = {
  -			fileRef = A8212D6908794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419508794AF700677359 = {
  -			fileRef = A8212D6A08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419608794AF700677359 = {
  -			fileRef = A8212D6B08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419708794AF700677359 = {
  -			fileRef = A8212D6C08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419808794AF700677359 = {
  -			fileRef = A8212D6D08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419908794AF700677359 = {
  -			fileRef = A8212D6E08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419A08794AF700677359 = {
  -			fileRef = A8212D6F08794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419B08794AF700677359 = {
  -			fileRef = A8212D7008794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419C08794AF700677359 = {
  -			fileRef = A8212D7108794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419D08794AF700677359 = {
  -			fileRef = A8212D7208794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419E08794AF700677359 = {
  -			fileRef = A8212D7308794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821419F08794AF700677359 = {
  -			fileRef = A8212D7408794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -				ATTRIBUTES = (
  -					Private,
  -				);
  -			};
  -		};
  -		A82141A008794AF700677359 = {
  -			fileRef = A8212D7508794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141A108794AF700677359 = {
  -			fileRef = A8212D7608794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141AC08794AF700677359 = {
  -			fileRef = A8212D8308794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141AD08794AF700677359 = {
  -			fileRef = A8212D8408794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141B008794AF700677359 = {
  -			fileRef = A8212D8908794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141B108794AF700677359 = {
  -			fileRef = A8212D8A08794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141BF08794AF700677359 = {
  -			fileRef = A8212D9A08794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141C108794AF700677359 = {
  -			fileRef = A8212D9C08794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141C208794AF700677359 = {
  -			fileRef = A8212D9D08794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141C308794AF700677359 = {
  -			fileRef = A8212D9E08794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141C408794AF700677359 = {
  -			fileRef = A8212D9F08794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141C508794AF700677359 = {
  -			fileRef = A8212DA008794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141C708794AF700677359 = {
  -			fileRef = A8212DA208794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141C908794AF700677359 = {
  -			fileRef = A8212DA408794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141CA08794AF700677359 = {
  -			fileRef = A8212DA508794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141CB08794AF700677359 = {
  -			fileRef = A8212DA608794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141CC08794AF700677359 = {
  -			fileRef = A8212DA708794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141CD08794AF700677359 = {
  -			fileRef = A8212DA808794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141CE08794AF700677359 = {
  -			fileRef = A8212DA908794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141CF08794AF700677359 = {
  -			fileRef = A8212DAA08794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141D008794AF700677359 = {
  -			fileRef = A8212DAB08794AB600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141D408794AF700677359 = {
  -			fileRef = A8212DAF08794AB700677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82141D508794AF700677359 = {
  -			fileRef = A8212DB008794AB700677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421108794AF700677359 = {
  -			fileRef = A8212DF108794AB700677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421208794AF700677359 = {
  -			fileRef = A8212DF208794AB700677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421308794AF700677359 = {
  -			fileRef = A8212DF308794AB700677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421408794AF700677359 = {
  -			fileRef = A8212DF408794AB700677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421508794AF700677359 = {
  -			fileRef = A8212DF508794AB700677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421608794AF700677359 = {
  -			fileRef = A8212DF608794AB700677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421808794AF700677359 = {
  -			fileRef = A8212DF908794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421908794AF700677359 = {
  -			fileRef = A8212DFA08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421A08794AF800677359 = {
  -			fileRef = A8212DFB08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421B08794AF800677359 = {
  -			fileRef = A8212DFC08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421C08794AF800677359 = {
  -			fileRef = A8212DFD08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421D08794AF800677359 = {
  -			fileRef = A8212DFE08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421E08794AF800677359 = {
  -			fileRef = A8212DFF08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821421F08794AF800677359 = {
  -			fileRef = A8212E0008794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422008794AF800677359 = {
  -			fileRef = A8212E0108794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422108794AF800677359 = {
  -			fileRef = A8212E0208794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422208794AF800677359 = {
  -			fileRef = A8212E0308794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422308794AF800677359 = {
  -			fileRef = A8212E0408794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422408794AF800677359 = {
  -			fileRef = A8212E0508794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422508794AF800677359 = {
  -			fileRef = A8212E0608794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422608794AF800677359 = {
  -			fileRef = A8212E0708794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422708794AF800677359 = {
  -			fileRef = A8212E0808794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422808794AF800677359 = {
  -			fileRef = A8212E0908794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422908794AF800677359 = {
  -			fileRef = A8212E0A08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422A08794AF800677359 = {
  -			fileRef = A8212E0B08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422B08794AF800677359 = {
  -			fileRef = A8212E0C08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422C08794AF800677359 = {
  -			fileRef = A8212E0D08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422D08794AF800677359 = {
  -			fileRef = A8212E0E08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422E08794AF800677359 = {
  -			fileRef = A8212E0F08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821422F08794AF800677359 = {
  -			fileRef = A8212E1008794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423008794AF800677359 = {
  -			fileRef = A8212E1108794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423108794AF800677359 = {
  -			fileRef = A8212E1208794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423208794AF800677359 = {
  -			fileRef = A8212E1308794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423308794AF800677359 = {
  -			fileRef = A8212E1408794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423408794AF800677359 = {
  -			fileRef = A8212E1508794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423508794AF800677359 = {
  -			fileRef = A8212E1608794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423608794AF800677359 = {
  -			fileRef = A8212E1708794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423708794AF800677359 = {
  -			fileRef = A8212E1808794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423808794AF800677359 = {
  -			fileRef = A8212E1908794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423908794AF800677359 = {
  -			fileRef = A8212E1A08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423A08794AF800677359 = {
  -			fileRef = A8212E1B08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423B08794AF800677359 = {
  -			fileRef = A8212E1C08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423C08794AF800677359 = {
  -			fileRef = A8212E1D08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423D08794AF800677359 = {
  -			fileRef = A8212E1F08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423E08794AF800677359 = {
  -			fileRef = A8212E2008794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821423F08794AF800677359 = {
  -			fileRef = A8212E2108794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424008794AF800677359 = {
  -			fileRef = A8212E2208794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424108794AF800677359 = {
  -			fileRef = A8212E2308794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424208794AF800677359 = {
  -			fileRef = A8212E2408794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424308794AF800677359 = {
  -			fileRef = A8212E2508794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424408794AF800677359 = {
  -			fileRef = A8212E2608794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424508794AF800677359 = {
  -			fileRef = A8212E2708794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424608794AF800677359 = {
  -			fileRef = A8212E2808794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424708794AF800677359 = {
  -			fileRef = A8212E2908794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424808794AF800677359 = {
  -			fileRef = A8212E2A08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424908794AF800677359 = {
  -			fileRef = A8212E2B08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424A08794AF800677359 = {
  -			fileRef = A8212E2C08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424B08794AF800677359 = {
  -			fileRef = A8212E2D08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424C08794AF800677359 = {
  -			fileRef = A8212E2E08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424D08794AF800677359 = {
  -			fileRef = A8212E2F08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424E08794AF800677359 = {
  -			fileRef = A8212E3008794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821424F08794AF800677359 = {
  -			fileRef = A8212E3108794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425008794AF800677359 = {
  -			fileRef = A8212E3208794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425108794AF800677359 = {
  -			fileRef = A8212E3308794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425208794AF800677359 = {
  -			fileRef = A8212E3408794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425308794AF800677359 = {
  -			fileRef = A8212E3508794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425408794AF800677359 = {
  -			fileRef = A8212E3608794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425508794AF800677359 = {
  -			fileRef = A8212E3708794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425608794AF800677359 = {
  -			fileRef = A8212E3808794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425708794AF800677359 = {
  -			fileRef = A8212E3908794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425808794AF800677359 = {
  -			fileRef = A8212E3A08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425908794AF800677359 = {
  -			fileRef = A8212E3B08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425A08794AF800677359 = {
  -			fileRef = A8212E3C08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425B08794AF800677359 = {
  -			fileRef = A8212E3D08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425C08794AF800677359 = {
  -			fileRef = A8212E3E08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425D08794AF800677359 = {
  -			fileRef = A8212E3F08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425E08794AF800677359 = {
  -			fileRef = A8212E4008794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821425F08794AF800677359 = {
  -			fileRef = A8212E4108794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426008794AF800677359 = {
  -			fileRef = A8212E4208794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426108794AF800677359 = {
  -			fileRef = A8212E4308794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426208794AF800677359 = {
  -			fileRef = A8212E4408794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426308794AF800677359 = {
  -			fileRef = A8212E4508794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426408794AF800677359 = {
  -			fileRef = A8212E4608794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426508794AF800677359 = {
  -			fileRef = A8212E4708794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426608794AF800677359 = {
  -			fileRef = A8212E4808794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426708794AF800677359 = {
  -			fileRef = A8212E4908794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426908794AF800677359 = {
  -			fileRef = A8212E4B08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426A08794AF800677359 = {
  -			fileRef = A8212E4C08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426B08794AF800677359 = {
  -			fileRef = A8212E4D08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426C08794AF800677359 = {
  -			fileRef = A8212E4E08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426D08794AF800677359 = {
  -			fileRef = A8212E4F08794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426E08794AF800677359 = {
  -			fileRef = A8212E5008794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821426F08794AF800677359 = {
  -			fileRef = A8212E5108794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427008794AF800677359 = {
  -			fileRef = A8212E5208794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427108794AF800677359 = {
  -			fileRef = A8212E5308794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427208794AF800677359 = {
  -			fileRef = A8212E5408794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427308794AF800677359 = {
  -			fileRef = A8212E5508794AB800677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427408794AF800677359 = {
  -			fileRef = A8212E5608794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427508794AF800677359 = {
  -			fileRef = A8212E5708794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427608794AF800677359 = {
  -			fileRef = A8212E5808794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427708794AF800677359 = {
  -			fileRef = A8212E5908794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427808794AF800677359 = {
  -			fileRef = A8212E5A08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427A08794AF800677359 = {
  -			fileRef = A8212E5C08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427B08794AF800677359 = {
  -			fileRef = A8212E5D08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427C08794AF800677359 = {
  -			fileRef = A8212E5E08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427E08794AF800677359 = {
  -			fileRef = A8212E6008794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821427F08794AF800677359 = {
  -			fileRef = A8212E6108794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428008794AF800677359 = {
  -			fileRef = A8212E6208794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428108794AF800677359 = {
  -			fileRef = A8212E6308794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428208794AF800677359 = {
  -			fileRef = A8212E6408794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428308794AF800677359 = {
  -			fileRef = A8212E6508794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428408794AF800677359 = {
  -			fileRef = A8212E6608794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428508794AF800677359 = {
  -			fileRef = A8212E6708794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428608794AF800677359 = {
  -			fileRef = A8212E6808794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428708794AF800677359 = {
  -			fileRef = A8212E6908794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428808794AF800677359 = {
  -			fileRef = A8212E6A08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428908794AF800677359 = {
  -			fileRef = A8212E6B08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428A08794AF800677359 = {
  -			fileRef = A8212E6D08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428B08794AF800677359 = {
  -			fileRef = A8212E6E08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428C08794AF800677359 = {
  -			fileRef = A8212E6F08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428D08794AF800677359 = {
  -			fileRef = A8212E7008794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428E08794AF800677359 = {
  -			fileRef = A8212E7108794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821428F08794AF800677359 = {
  -			fileRef = A8212E7208794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429108794AF800677359 = {
  -			fileRef = A8212E7408794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429208794AF800677359 = {
  -			fileRef = A8212E7508794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429308794AF800677359 = {
  -			fileRef = A8212E7608794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429408794AF800677359 = {
  -			fileRef = A8212E7708794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429B08794AF800677359 = {
  -			fileRef = A8212E7F08794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429C08794AF800677359 = {
  -			fileRef = A8212E8008794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429D08794AF800677359 = {
  -			fileRef = A8212E8108794AB900677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429E08794AF800677359 = {
  -			fileRef = A8212E8208794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821429F08794AF800677359 = {
  -			fileRef = A8212E8308794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A008794AF800677359 = {
  -			fileRef = A8212E8408794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A108794AF800677359 = {
  -			fileRef = A8212E8508794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A208794AF800677359 = {
  -			fileRef = A8212E8608794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A308794AF800677359 = {
  -			fileRef = A8212E8708794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A408794AF800677359 = {
  -			fileRef = A8212E8808794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A508794AF800677359 = {
  -			fileRef = A8212E8908794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A608794AF800677359 = {
  -			fileRef = A8212E8A08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A708794AF800677359 = {
  -			fileRef = A8212E8B08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A808794AF800677359 = {
  -			fileRef = A8212E8C08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142A908794AF800677359 = {
  -			fileRef = A8212E8D08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142AA08794AF800677359 = {
  -			fileRef = A8212E8E08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142AB08794AF800677359 = {
  -			fileRef = A8212E8F08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142AC08794AF800677359 = {
  -			fileRef = A8212E9008794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142AD08794AF800677359 = {
  -			fileRef = A8212E9108794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142AE08794AF800677359 = {
  -			fileRef = A8212E9208794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142AF08794AF800677359 = {
  -			fileRef = A8212E9308794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B008794AF800677359 = {
  -			fileRef = A8212E9408794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B108794AF800677359 = {
  -			fileRef = A8212E9508794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B208794AF800677359 = {
  -			fileRef = A8212E9608794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B308794AF800677359 = {
  -			fileRef = A8212E9708794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B408794AF800677359 = {
  -			fileRef = A8212E9808794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B508794AF800677359 = {
  -			fileRef = A8212E9A08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B608794AF800677359 = {
  -			fileRef = A8212E9B08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B708794AF800677359 = {
  -			fileRef = A8212E9C08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B808794AF800677359 = {
  -			fileRef = A8212E9D08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142B908794AF800677359 = {
  -			fileRef = A8212E9E08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142BA08794AF800677359 = {
  -			fileRef = A8212E9F08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142BB08794AF800677359 = {
  -			fileRef = A8212EA008794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142BC08794AF800677359 = {
  -			fileRef = A8212EA108794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142BD08794AF800677359 = {
  -			fileRef = A8212EA208794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C108794AF800677359 = {
  -			fileRef = A8212EA608794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C208794AF800677359 = {
  -			fileRef = A8212EA708794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C308794AF800677359 = {
  -			fileRef = A8212EA808794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C408794AF800677359 = {
  -			fileRef = A8212EA908794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C508794AF800677359 = {
  -			fileRef = A8212EAA08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C608794AF800677359 = {
  -			fileRef = A8212EAB08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C708794AF800677359 = {
  -			fileRef = A8212EAC08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C808794AF800677359 = {
  -			fileRef = A8212EAD08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142C908794AF800677359 = {
  -			fileRef = A8212EAF08794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142CA08794AF800677359 = {
  -			fileRef = A8212EB008794ABA00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142CB08794AF800677359 = {
  -			fileRef = A8212EB108794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142CC08794AF800677359 = {
  -			fileRef = A8212EB208794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142CD08794AF800677359 = {
  -			fileRef = A8212EB308794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142CE08794AF800677359 = {
  -			fileRef = A8212EB408794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142CF08794AF800677359 = {
  -			fileRef = A8212EB508794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D008794AF800677359 = {
  -			fileRef = A8212EB608794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D108794AF800677359 = {
  -			fileRef = A8212EB708794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D208794AF800677359 = {
  -			fileRef = A8212EB808794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D308794AF800677359 = {
  -			fileRef = A8212EBA08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D408794AF800677359 = {
  -			fileRef = A8212EBB08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D508794AF800677359 = {
  -			fileRef = A8212EBC08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D608794AF800677359 = {
  -			fileRef = A8212EBD08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D708794AF800677359 = {
  -			fileRef = A8212EBE08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D808794AF800677359 = {
  -			fileRef = A8212EBF08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142D908794AF800677359 = {
  -			fileRef = A8212EC008794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142DA08794AF800677359 = {
  -			fileRef = A8212EC108794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142DB08794AF800677359 = {
  -			fileRef = A8212EC208794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142DC08794AF800677359 = {
  -			fileRef = A8212EC308794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142DD08794AF800677359 = {
  -			fileRef = A8212EC408794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142DE08794AF800677359 = {
  -			fileRef = A8212EC508794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E008794AF800677359 = {
  -			fileRef = A8212EC708794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E108794AF800677359 = {
  -			fileRef = A8212EC808794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E208794AF800677359 = {
  -			fileRef = A8212EC908794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E308794AF800677359 = {
  -			fileRef = A8212ECA08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E408794AF800677359 = {
  -			fileRef = A8212ECB08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E508794AF800677359 = {
  -			fileRef = A8212ECC08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E608794AF800677359 = {
  -			fileRef = A8212ECD08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E708794AF800677359 = {
  -			fileRef = A8212ECE08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E808794AF800677359 = {
  -			fileRef = A8212ECF08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142E908794AF800677359 = {
  -			fileRef = A8212ED008794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142EA08794AF800677359 = {
  -			fileRef = A8212ED108794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142EC08794AF800677359 = {
  -			fileRef = A8212ED308794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142ED08794AF800677359 = {
  -			fileRef = A8212ED408794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142EE08794AF800677359 = {
  -			fileRef = A8212ED508794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142EF08794AF800677359 = {
  -			fileRef = A8212ED608794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F008794AF800677359 = {
  -			fileRef = A8212ED708794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F108794AF800677359 = {
  -			fileRef = A8212ED808794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F208794AF800677359 = {
  -			fileRef = A8212ED908794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F308794AF800677359 = {
  -			fileRef = A8212EDA08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F408794AF800677359 = {
  -			fileRef = A8212EDC08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F508794AF800677359 = {
  -			fileRef = A8212EDD08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F608794AF800677359 = {
  -			fileRef = A8212EDE08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F708794AF800677359 = {
  -			fileRef = A8212EDF08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F808794AF800677359 = {
  -			fileRef = A8212EE008794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142F908794AF800677359 = {
  -			fileRef = A8212EE108794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142FA08794AF800677359 = {
  -			fileRef = A8212EE208794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142FB08794AF800677359 = {
  -			fileRef = A8212EE308794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142FC08794AF800677359 = {
  -			fileRef = A8212EE408794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142FD08794AF800677359 = {
  -			fileRef = A8212EE508794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142FE08794AF800677359 = {
  -			fileRef = A8212EE608794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82142FF08794AF800677359 = {
  -			fileRef = A8212EE708794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430008794AF800677359 = {
  -			fileRef = A8212EE808794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430108794AF800677359 = {
  -			fileRef = A8212EE908794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430208794AF800677359 = {
  -			fileRef = A8212EEA08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430308794AF800677359 = {
  -			fileRef = A8212EEB08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430508794AF800677359 = {
  -			fileRef = A8212EED08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430608794AF800677359 = {
  -			fileRef = A8212EEE08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430708794AF800677359 = {
  -			fileRef = A8212EEF08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430808794AF800677359 = {
  -			fileRef = A8212EF008794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430908794AF800677359 = {
  -			fileRef = A8212EF108794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430A08794AF800677359 = {
  -			fileRef = A8212EF208794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430B08794AF800677359 = {
  -			fileRef = A8212EF308794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430C08794AF800677359 = {
  -			fileRef = A8212EF408794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430D08794AF800677359 = {
  -			fileRef = A8212EF508794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430E08794AF800677359 = {
  -			fileRef = A8212EF608794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821430F08794AF800677359 = {
  -			fileRef = A8212EF708794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431008794AF800677359 = {
  -			fileRef = A8212EF808794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431108794AF800677359 = {
  -			fileRef = A8212EF908794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431208794AF800677359 = {
  -			fileRef = A8212EFA08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431308794AF800677359 = {
  -			fileRef = A8212EFB08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431408794AF800677359 = {
  -			fileRef = A8212EFC08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431508794AF800677359 = {
  -			fileRef = A8212EFD08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431608794AF800677359 = {
  -			fileRef = A8212EFE08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431708794AF800677359 = {
  -			fileRef = A8212EFF08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431808794AF800677359 = {
  -			fileRef = A8212F0008794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431908794AF800677359 = {
  -			fileRef = A8212F0108794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431A08794AF800677359 = {
  -			fileRef = A8212F0208794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431B08794AF800677359 = {
  -			fileRef = A8212F0308794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431C08794AF800677359 = {
  -			fileRef = A8212F0408794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431D08794AF800677359 = {
  -			fileRef = A8212F0508794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431E08794AF800677359 = {
  -			fileRef = A8212F0608794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821431F08794AF900677359 = {
  -			fileRef = A8212F0708794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432108794AF900677359 = {
  -			fileRef = A8212F0908794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432208794AF900677359 = {
  -			fileRef = A8212F0A08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432308794AF900677359 = {
  -			fileRef = A8212F0B08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432408794AF900677359 = {
  -			fileRef = A8212F0C08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432508794AF900677359 = {
  -			fileRef = A8212F0D08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432608794AF900677359 = {
  -			fileRef = A8212F0E08794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432908794AF900677359 = {
  -			fileRef = A8212F1108794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432A08794AF900677359 = {
  -			fileRef = A8212F1208794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432B08794AF900677359 = {
  -			fileRef = A8212F1308794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432C08794AF900677359 = {
  -			fileRef = A8212F1408794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432D08794AF900677359 = {
  -			fileRef = A8212F1508794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432E08794AF900677359 = {
  -			fileRef = A8212F1608794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821432F08794AF900677359 = {
  -			fileRef = A8212F1708794ABB00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433008794AF900677359 = {
  -			fileRef = A8212F1808794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433108794AF900677359 = {
  -			fileRef = A8212F1908794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433208794AF900677359 = {
  -			fileRef = A8212F1A08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433308794AF900677359 = {
  -			fileRef = A8212F1B08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433408794AF900677359 = {
  -			fileRef = A8212F1C08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433508794AF900677359 = {
  -			fileRef = A8212F1D08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433608794AF900677359 = {
  -			fileRef = A8212F1E08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433808794AF900677359 = {
  -			fileRef = A8212F2008794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433908794AF900677359 = {
  -			fileRef = A8212F2308794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433A08794AF900677359 = {
  -			fileRef = A8212F2408794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433B08794AF900677359 = {
  -			fileRef = A8212F2508794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433C08794AF900677359 = {
  -			fileRef = A8212F2608794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433D08794AF900677359 = {
  -			fileRef = A8212F2708794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821433E08794AF900677359 = {
  -			fileRef = A8212F2808794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434608794AF900677359 = {
  -			fileRef = A8212F3208794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434708794AF900677359 = {
  -			fileRef = A8212F3308794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434808794AF900677359 = {
  -			fileRef = A8212F3508794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434908794AF900677359 = {
  -			fileRef = A8212F3608794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434A08794AF900677359 = {
  -			fileRef = A8212F3708794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434B08794AF900677359 = {
  -			fileRef = A8212F3808794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434C08794AF900677359 = {
  -			fileRef = A8212F3908794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434D08794AF900677359 = {
  -			fileRef = A8212F3A08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434E08794AF900677359 = {
  -			fileRef = A8212F3B08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821434F08794AF900677359 = {
  -			fileRef = A8212F3C08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435008794AF900677359 = {
  -			fileRef = A8212F3D08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435108794AF900677359 = {
  -			fileRef = A8212F3E08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435208794AF900677359 = {
  -			fileRef = A8212F3F08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435308794AF900677359 = {
  -			fileRef = A8212F4008794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435408794AF900677359 = {
  -			fileRef = A8212F4108794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435508794AF900677359 = {
  -			fileRef = A8212F4208794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435608794AF900677359 = {
  -			fileRef = A8212F4308794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435708794AF900677359 = {
  -			fileRef = A8212F4408794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435908794AF900677359 = {
  -			fileRef = A8212F4608794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435A08794AF900677359 = {
  -			fileRef = A8212F4708794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435B08794AF900677359 = {
  -			fileRef = A8212F4808794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435C08794AF900677359 = {
  -			fileRef = A8212F4908794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435D08794AF900677359 = {
  -			fileRef = A8212F4A08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435E08794AF900677359 = {
  -			fileRef = A8212F4B08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821435F08794AF900677359 = {
  -			fileRef = A8212F4C08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436008794AF900677359 = {
  -			fileRef = A8212F4D08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436108794AF900677359 = {
  -			fileRef = A8212F4E08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436208794AF900677359 = {
  -			fileRef = A8212F4F08794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436308794AF900677359 = {
  -			fileRef = A8212F5008794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436408794AF900677359 = {
  -			fileRef = A8212F5108794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436508794AF900677359 = {
  -			fileRef = A8212F5208794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436608794AF900677359 = {
  -			fileRef = A8212F5308794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436708794AF900677359 = {
  -			fileRef = A8212F5408794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436808794AF900677359 = {
  -			fileRef = A8212F5508794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436908794AF900677359 = {
  -			fileRef = A8212F5608794ABC00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436C08794AF900677359 = {
  -			fileRef = A8212F5908794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436D08794AF900677359 = {
  -			fileRef = A8212F5A08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436E08794AF900677359 = {
  -			fileRef = A8212F5B08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821436F08794AF900677359 = {
  -			fileRef = A8212F5C08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437008794AF900677359 = {
  -			fileRef = A8212F5D08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437108794AF900677359 = {
  -			fileRef = A8212F5E08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437208794AF900677359 = {
  -			fileRef = A8212F5F08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437308794AF900677359 = {
  -			fileRef = A8212F6008794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437408794AF900677359 = {
  -			fileRef = A8212F6108794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437708794AF900677359 = {
  -			fileRef = A8212F6508794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437808794AF900677359 = {
  -			fileRef = A8212F6608794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437908794AF900677359 = {
  -			fileRef = A8212F6708794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821437B08794AF900677359 = {
  -			fileRef = A8212F6908794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438008794AF900677359 = {
  -			fileRef = A8212F6E08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438108794AF900677359 = {
  -			fileRef = A8212F6F08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438208794AF900677359 = {
  -			fileRef = A8212F7108794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438308794AF900677359 = {
  -			fileRef = A8212F7208794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438408794AF900677359 = {
  -			fileRef = A8212F7408794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438508794AF900677359 = {
  -			fileRef = A8212F7508794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438708794AF900677359 = {
  -			fileRef = A8212F7708794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438808794AF900677359 = {
  -			fileRef = A8212F7808794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438908794AF900677359 = {
  -			fileRef = A8212F7908794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438A08794AF900677359 = {
  -			fileRef = A8212F7A08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438B08794AF900677359 = {
  -			fileRef = A8212F7B08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438D08794AF900677359 = {
  -			fileRef = A8212F7D08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438E08794AF900677359 = {
  -			fileRef = A8212F7E08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821438F08794AF900677359 = {
  -			fileRef = A8212F7F08794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821439008794AF900677359 = {
  -			fileRef = A8212F8008794ABD00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143A008794AF900677359 = {
  -			fileRef = A8212F9108794ABE00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143A108794AF900677359 = {
  -			fileRef = A8212F9208794ABE00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143B708794AF900677359 = {
  -			fileRef = A8212FAA08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143B808794AF900677359 = {
  -			fileRef = A8212FAB08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143BA08794AF900677359 = {
  -			fileRef = A8212FAE08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143BB08794AF900677359 = {
  -			fileRef = A8212FAF08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143BC08794AF900677359 = {
  -			fileRef = A8212FB108794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143BD08794AF900677359 = {
  -			fileRef = A8212FB208794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143BF08794AF900677359 = {
  -			fileRef = A8212FB408794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C008794AF900677359 = {
  -			fileRef = A8212FB508794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C108794AF900677359 = {
  -			fileRef = A8212FB608794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C208794AF900677359 = {
  -			fileRef = A8212FB708794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C308794AF900677359 = {
  -			fileRef = A8212FB808794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C408794AF900677359 = {
  -			fileRef = A8212FB908794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C508794AF900677359 = {
  -			fileRef = A8212FBA08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C608794AF900677359 = {
  -			fileRef = A8212FBB08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C708794AF900677359 = {
  -			fileRef = A8212FBC08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143C908794AF900677359 = {
  -			fileRef = A8212FBE08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143CA08794AF900677359 = {
  -			fileRef = A8212FBF08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143CB08794AF900677359 = {
  -			fileRef = A8212FC008794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143CC08794AF900677359 = {
  -			fileRef = A8212FC108794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143CD08794AF900677359 = {
  -			fileRef = A8212FC208794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143CE08794AF900677359 = {
  -			fileRef = A8212FC308794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143CF08794AF900677359 = {
  -			fileRef = A8212FC408794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D008794AF900677359 = {
  -			fileRef = A8212FC508794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D108794AF900677359 = {
  -			fileRef = A8212FC608794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D208794AF900677359 = {
  -			fileRef = A8212FC808794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D308794AF900677359 = {
  -			fileRef = A8212FC908794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D408794AF900677359 = {
  -			fileRef = A8212FCA08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D508794AF900677359 = {
  -			fileRef = A8212FCB08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D608794AF900677359 = {
  -			fileRef = A8212FCD08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D708794AF900677359 = {
  -			fileRef = A8212FCE08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D808794AF900677359 = {
  -			fileRef = A8212FCF08794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143D908794AF900677359 = {
  -			fileRef = A8212FD008794ABF00677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143F508794AF900677359 = {
  -			fileRef = A8212FF408794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143F608794AF900677359 = {
  -			fileRef = A8212FF508794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143F708794AF900677359 = {
  -			fileRef = A8212FF608794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143F808794AF900677359 = {
  -			fileRef = A8212FF708794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143F908794AF900677359 = {
  -			fileRef = A8212FF908794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143FA08794AF900677359 = {
  -			fileRef = A8212FFA08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143FC08794AF900677359 = {
  -			fileRef = A8212FFC08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143FD08794AF900677359 = {
  -			fileRef = A8212FFD08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143FE08794AF900677359 = {
  -			fileRef = A8212FFE08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82143FF08794AF900677359 = {
  -			fileRef = A8212FFF08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440008794AF900677359 = {
  -			fileRef = A821300008794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440108794AF900677359 = {
  -			fileRef = A821300108794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440208794AF900677359 = {
  -			fileRef = A821300208794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440308794AF900677359 = {
  -			fileRef = A821300308794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440408794AF900677359 = {
  -			fileRef = A821300408794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440508794AF900677359 = {
  -			fileRef = A821300508794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440708794AF900677359 = {
  -			fileRef = A821300808794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440808794AF900677359 = {
  -			fileRef = A821300908794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440908794AF900677359 = {
  -			fileRef = A821300A08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440A08794AF900677359 = {
  -			fileRef = A821300B08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440B08794AF900677359 = {
  -			fileRef = A821300C08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440C08794AF900677359 = {
  -			fileRef = A821300D08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440D08794AF900677359 = {
  -			fileRef = A821300E08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440E08794AF900677359 = {
  -			fileRef = A821300F08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821440F08794AF900677359 = {
  -			fileRef = A821301008794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441008794AF900677359 = {
  -			fileRef = A821301108794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441108794AF900677359 = {
  -			fileRef = A821301208794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441208794AF900677359 = {
  -			fileRef = A821301308794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441308794AF900677359 = {
  -			fileRef = A821301408794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441408794AF900677359 = {
  -			fileRef = A821301508794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441608794AF900677359 = {
  -			fileRef = A821301708794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441708794AF900677359 = {
  -			fileRef = A821301808794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441808794AF900677359 = {
  -			fileRef = A821301908794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441908794AF900677359 = {
  -			fileRef = A821301A08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441A08794AF900677359 = {
  -			fileRef = A821301B08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441B08794AF900677359 = {
  -			fileRef = A821301C08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441D08794AF900677359 = {
  -			fileRef = A821301E08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441E08794AF900677359 = {
  -			fileRef = A821301F08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821441F08794AF900677359 = {
  -			fileRef = A821302008794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442008794AFA00677359 = {
  -			fileRef = A821302108794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442108794AFA00677359 = {
  -			fileRef = A821302208794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442208794AFA00677359 = {
  -			fileRef = A821302308794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442308794AFA00677359 = {
  -			fileRef = A821302408794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442408794AFA00677359 = {
  -			fileRef = A821302508794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442508794AFA00677359 = {
  -			fileRef = A821302608794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442608794AFA00677359 = {
  -			fileRef = A821302708794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442708794AFA00677359 = {
  -			fileRef = A821302808794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442808794AFA00677359 = {
  -			fileRef = A821302908794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442908794AFA00677359 = {
  -			fileRef = A821302A08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442A08794AFA00677359 = {
  -			fileRef = A821302B08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442C08794AFA00677359 = {
  -			fileRef = A821302D08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442D08794AFA00677359 = {
  -			fileRef = A821302E08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442E08794AFA00677359 = {
  -			fileRef = A821302F08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821442F08794AFA00677359 = {
  -			fileRef = A821303008794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443108794AFA00677359 = {
  -			fileRef = A821303208794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443208794AFA00677359 = {
  -			fileRef = A821303308794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443308794AFA00677359 = {
  -			fileRef = A821303508794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443408794AFA00677359 = {
  -			fileRef = A821303608794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443808794AFA00677359 = {
  -			fileRef = A821303A08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443908794AFA00677359 = {
  -			fileRef = A821303B08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443A08794AFA00677359 = {
  -			fileRef = A821303C08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443B08794AFA00677359 = {
  -			fileRef = A821303D08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443C08794AFA00677359 = {
  -			fileRef = A821303E08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443D08794AFA00677359 = {
  -			fileRef = A821303F08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821443E08794AFA00677359 = {
  -			fileRef = A821304008794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444008794AFA00677359 = {
  -			fileRef = A821304308794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444108794AFA00677359 = {
  -			fileRef = A821304408794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444208794AFA00677359 = {
  -			fileRef = A821304508794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444308794AFA00677359 = {
  -			fileRef = A821304608794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444408794AFA00677359 = {
  -			fileRef = A821304708794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444508794AFA00677359 = {
  -			fileRef = A821304808794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444608794AFA00677359 = {
  -			fileRef = A821304908794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444708794AFA00677359 = {
  -			fileRef = A821304A08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444808794AFA00677359 = {
  -			fileRef = A821304B08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444908794AFA00677359 = {
  -			fileRef = A821304C08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444A08794AFA00677359 = {
  -			fileRef = A821304D08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444B08794AFA00677359 = {
  -			fileRef = A821304E08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444C08794AFA00677359 = {
  -			fileRef = A821304F08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821444D08794AFA00677359 = {
  -			fileRef = A821305008794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445208794AFA00677359 = {
  -			fileRef = A821305508794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445308794AFA00677359 = {
  -			fileRef = A821305608794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445408794AFA00677359 = {
  -			fileRef = A821305708794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445508794AFA00677359 = {
  -			fileRef = A821305808794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445608794AFA00677359 = {
  -			fileRef = A821305908794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445708794AFA00677359 = {
  -			fileRef = A821305A08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445808794AFA00677359 = {
  -			fileRef = A821305B08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445908794AFA00677359 = {
  -			fileRef = A821305C08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445A08794AFA00677359 = {
  -			fileRef = A821305D08794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445D08794AFA00677359 = {
  -			fileRef = A821306008794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445E08794AFA00677359 = {
  -			fileRef = A821306108794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821445F08794AFA00677359 = {
  -			fileRef = A821306208794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446008794AFA00677359 = {
  -			fileRef = A821306308794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446108794AFA00677359 = {
  -			fileRef = A821306408794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446208794AFA00677359 = {
  -			fileRef = A821306508794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446308794AFA00677359 = {
  -			fileRef = A821306608794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446408794AFA00677359 = {
  -			fileRef = A821306708794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446508794AFA00677359 = {
  -			fileRef = A821306808794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446608794AFA00677359 = {
  -			fileRef = A821306908794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446708794AFA00677359 = {
  -			fileRef = A821306A08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446808794AFA00677359 = {
  -			fileRef = A821306B08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446908794AFA00677359 = {
  -			fileRef = A821306E08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446A08794AFA00677359 = {
  -			fileRef = A821306F08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446C08794AFA00677359 = {
  -			fileRef = A821307108794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446D08794AFA00677359 = {
  -			fileRef = A821307208794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446E08794AFA00677359 = {
  -			fileRef = A821307308794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821446F08794AFA00677359 = {
  -			fileRef = A821307408794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447008794AFA00677359 = {
  -			fileRef = A821307508794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447108794AFA00677359 = {
  -			fileRef = A821307608794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447208794AFA00677359 = {
  -			fileRef = A821307708794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447308794AFA00677359 = {
  -			fileRef = A821307808794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447408794AFA00677359 = {
  -			fileRef = A821307908794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447508794AFA00677359 = {
  -			fileRef = A821307A08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447608794AFA00677359 = {
  -			fileRef = A821307B08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447708794AFA00677359 = {
  -			fileRef = A821307C08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447808794AFA00677359 = {
  -			fileRef = A821307D08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447908794AFA00677359 = {
  -			fileRef = A821307E08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447A08794AFA00677359 = {
  -			fileRef = A821307F08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447B08794AFA00677359 = {
  -			fileRef = A821308008794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447C08794AFA00677359 = {
  -			fileRef = A821308108794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447D08794AFA00677359 = {
  -			fileRef = A821308208794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447E08794AFA00677359 = {
  -			fileRef = A821308308794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821447F08794AFA00677359 = {
  -			fileRef = A821308408794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448008794AFA00677359 = {
  -			fileRef = A821308508794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448508794AFA00677359 = {
  -			fileRef = A821308B08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448608794AFA00677359 = {
  -			fileRef = A821308C08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448708794AFA00677359 = {
  -			fileRef = A821308D08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448808794AFA00677359 = {
  -			fileRef = A821308E08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448908794AFA00677359 = {
  -			fileRef = A821308F08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448A08794AFA00677359 = {
  -			fileRef = A821309008794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448B08794AFA00677359 = {
  -			fileRef = A821309108794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448C08794AFA00677359 = {
  -			fileRef = A821309208794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448D08794AFA00677359 = {
  -			fileRef = A821309308794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448E08794AFA00677359 = {
  -			fileRef = A821309408794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821448F08794AFA00677359 = {
  -			fileRef = A821309708794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449008794AFA00677359 = {
  -			fileRef = A821309808794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449108794AFA00677359 = {
  -			fileRef = A821309908794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449208794AFA00677359 = {
  -			fileRef = A821309A08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449308794AFA00677359 = {
  -			fileRef = A821309B08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449408794AFA00677359 = {
  -			fileRef = A821309C08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449808794AFA00677359 = {
  -			fileRef = A82130A208794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449908794AFA00677359 = {
  -			fileRef = A82130A308794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449A08794AFA00677359 = {
  -			fileRef = A82130A408794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449B08794AFA00677359 = {
  -			fileRef = A82130A508794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449D08794AFA00677359 = {
  -			fileRef = A82130A708794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449E08794AFA00677359 = {
  -			fileRef = A82130A808794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821449F08794AFA00677359 = {
  -			fileRef = A82130A908794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A008794AFA00677359 = {
  -			fileRef = A82130AA08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A108794AFA00677359 = {
  -			fileRef = A82130AB08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A208794AFA00677359 = {
  -			fileRef = A82130AC08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A308794AFA00677359 = {
  -			fileRef = A82130AD08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A408794AFA00677359 = {
  -			fileRef = A82130AE08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A508794AFA00677359 = {
  -			fileRef = A82130AF08794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A608794AFA00677359 = {
  -			fileRef = A82130B008794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A708794AFA00677359 = {
  -			fileRef = A82130B108794AC100677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144A908794AFA00677359 = {
  -			fileRef = A82130B408794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144AA08794AFA00677359 = {
  -			fileRef = A82130B508794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144AB08794AFA00677359 = {
  -			fileRef = A82130B608794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144AC08794AFA00677359 = {
  -			fileRef = A82130B708794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144AE08794AFA00677359 = {
  -			fileRef = A82130B908794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B008794AFA00677359 = {
  -			fileRef = A82130BC08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B108794AFA00677359 = {
  -			fileRef = A82130BD08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B208794AFA00677359 = {
  -			fileRef = A82130BE08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B308794AFA00677359 = {
  -			fileRef = A82130BF08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B408794AFA00677359 = {
  -			fileRef = A82130C008794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B508794AFA00677359 = {
  -			fileRef = A82130C108794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B608794AFA00677359 = {
  -			fileRef = A82130C208794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B708794AFA00677359 = {
  -			fileRef = A82130C308794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B808794AFA00677359 = {
  -			fileRef = A82130C408794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144B908794AFA00677359 = {
  -			fileRef = A82130C508794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144BA08794AFA00677359 = {
  -			fileRef = A82130C608794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144BB08794AFA00677359 = {
  -			fileRef = A82130C708794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144BC08794AFA00677359 = {
  -			fileRef = A82130C808794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144BD08794AFA00677359 = {
  -			fileRef = A82130C908794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144BE08794AFA00677359 = {
  -			fileRef = A82130CA08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144BF08794AFA00677359 = {
  -			fileRef = A82130CB08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C008794AFA00677359 = {
  -			fileRef = A82130CC08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C108794AFA00677359 = {
  -			fileRef = A82130CD08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C208794AFA00677359 = {
  -			fileRef = A82130CE08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C308794AFA00677359 = {
  -			fileRef = A82130CF08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C408794AFA00677359 = {
  -			fileRef = A82130D008794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C508794AFA00677359 = {
  -			fileRef = A82130D108794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C608794AFA00677359 = {
  -			fileRef = A82130D208794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C708794AFA00677359 = {
  -			fileRef = A82130D308794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C808794AFA00677359 = {
  -			fileRef = A82130D408794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144C908794AFA00677359 = {
  -			fileRef = A82130D508794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144CA08794AFA00677359 = {
  -			fileRef = A82130D608794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144CB08794AFA00677359 = {
  -			fileRef = A82130D708794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144CC08794AFA00677359 = {
  -			fileRef = A82130D808794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144CD08794AFA00677359 = {
  -			fileRef = A82130D908794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144CE08794AFA00677359 = {
  -			fileRef = A82130DA08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144CF08794AFA00677359 = {
  -			fileRef = A82130DB08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D008794AFA00677359 = {
  -			fileRef = A82130DC08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D108794AFA00677359 = {
  -			fileRef = A82130DD08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D208794AFA00677359 = {
  -			fileRef = A82130DE08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D308794AFA00677359 = {
  -			fileRef = A82130DF08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D408794AFA00677359 = {
  -			fileRef = A82130E008794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D508794AFA00677359 = {
  -			fileRef = A82130E108794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D608794AFA00677359 = {
  -			fileRef = A82130E208794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D708794AFA00677359 = {
  -			fileRef = A82130E308794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D808794AFA00677359 = {
  -			fileRef = A82130E408794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144D908794AFA00677359 = {
  -			fileRef = A82130E508794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144DA08794AFA00677359 = {
  -			fileRef = A82130E608794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144DB08794AFA00677359 = {
  -			fileRef = A82130E708794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144DC08794AFA00677359 = {
  -			fileRef = A82130E808794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144DD08794AFA00677359 = {
  -			fileRef = A82130E908794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144DE08794AFA00677359 = {
  -			fileRef = A82130EA08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144DF08794AFA00677359 = {
  -			fileRef = A82130EB08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E008794AFA00677359 = {
  -			fileRef = A82130EC08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E108794AFA00677359 = {
  -			fileRef = A82130ED08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E208794AFA00677359 = {
  -			fileRef = A82130EE08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E308794AFA00677359 = {
  -			fileRef = A82130EF08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E408794AFA00677359 = {
  -			fileRef = A82130F008794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E508794AFA00677359 = {
  -			fileRef = A82130F108794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E608794AFA00677359 = {
  -			fileRef = A82130F208794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E708794AFA00677359 = {
  -			fileRef = A82130F308794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E808794AFA00677359 = {
  -			fileRef = A82130F408794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144E908794AFA00677359 = {
  -			fileRef = A82130F508794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144EA08794AFA00677359 = {
  -			fileRef = A82130F608794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144EB08794AFA00677359 = {
  -			fileRef = A82130F708794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144EC08794AFA00677359 = {
  -			fileRef = A82130F808794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144ED08794AFA00677359 = {
  -			fileRef = A82130F908794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144EE08794AFA00677359 = {
  -			fileRef = A82130FA08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144EF08794AFA00677359 = {
  -			fileRef = A82130FB08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F008794AFA00677359 = {
  -			fileRef = A82130FC08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F108794AFA00677359 = {
  -			fileRef = A82130FD08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F208794AFA00677359 = {
  -			fileRef = A82130FE08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F308794AFA00677359 = {
  -			fileRef = A82130FF08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F408794AFA00677359 = {
  -			fileRef = A821310008794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F508794AFA00677359 = {
  -			fileRef = A821310108794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F608794AFA00677359 = {
  -			fileRef = A821310208794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F708794AFA00677359 = {
  -			fileRef = A821310308794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F808794AFA00677359 = {
  -			fileRef = A821310408794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144F908794AFA00677359 = {
  -			fileRef = A821310508794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144FA08794AFA00677359 = {
  -			fileRef = A821310608794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144FB08794AFA00677359 = {
  -			fileRef = A821310708794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144FC08794AFA00677359 = {
  -			fileRef = A821310808794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144FD08794AFA00677359 = {
  -			fileRef = A821310908794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144FE08794AFA00677359 = {
  -			fileRef = A821310A08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82144FF08794AFA00677359 = {
  -			fileRef = A821310B08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450008794AFA00677359 = {
  -			fileRef = A821310C08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450108794AFA00677359 = {
  -			fileRef = A821310D08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450208794AFA00677359 = {
  -			fileRef = A821310E08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450308794AFA00677359 = {
  -			fileRef = A821310F08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450408794AFA00677359 = {
  -			fileRef = A821311008794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450508794AFA00677359 = {
  -			fileRef = A821311108794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450608794AFA00677359 = {
  -			fileRef = A821311208794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450708794AFA00677359 = {
  -			fileRef = A821311308794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450808794AFA00677359 = {
  -			fileRef = A821311408794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450908794AFA00677359 = {
  -			fileRef = A821311508794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450A08794AFA00677359 = {
  -			fileRef = A821311608794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450B08794AFA00677359 = {
  -			fileRef = A821311708794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450C08794AFA00677359 = {
  -			fileRef = A821311808794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450D08794AFA00677359 = {
  -			fileRef = A821311908794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450E08794AFA00677359 = {
  -			fileRef = A821311A08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821450F08794AFA00677359 = {
  -			fileRef = A821311B08794AC200677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451008794AFA00677359 = {
  -			fileRef = A821311C08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451108794AFA00677359 = {
  -			fileRef = A821311D08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451208794AFA00677359 = {
  -			fileRef = A821311E08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451308794AFA00677359 = {
  -			fileRef = A821311F08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451408794AFA00677359 = {
  -			fileRef = A821312008794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451508794AFA00677359 = {
  -			fileRef = A821312108794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451608794AFA00677359 = {
  -			fileRef = A821312208794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451708794AFA00677359 = {
  -			fileRef = A821312308794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451808794AFA00677359 = {
  -			fileRef = A821312408794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451908794AFA00677359 = {
  -			fileRef = A821312508794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451A08794AFB00677359 = {
  -			fileRef = A821312608794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451B08794AFB00677359 = {
  -			fileRef = A821312708794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451C08794AFB00677359 = {
  -			fileRef = A821312808794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451D08794AFB00677359 = {
  -			fileRef = A821312908794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451E08794AFB00677359 = {
  -			fileRef = A821312A08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821451F08794AFB00677359 = {
  -			fileRef = A821312B08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452008794AFB00677359 = {
  -			fileRef = A821312C08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452108794AFB00677359 = {
  -			fileRef = A821312D08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452208794AFB00677359 = {
  -			fileRef = A821312E08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452308794AFB00677359 = {
  -			fileRef = A821312F08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452408794AFB00677359 = {
  -			fileRef = A821313008794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452508794AFB00677359 = {
  -			fileRef = A821313108794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452608794AFB00677359 = {
  -			fileRef = A821313208794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452708794AFB00677359 = {
  -			fileRef = A821313308794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452808794AFB00677359 = {
  -			fileRef = A821313408794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452908794AFB00677359 = {
  -			fileRef = A821313508794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452A08794AFB00677359 = {
  -			fileRef = A821313608794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452B08794AFB00677359 = {
  -			fileRef = A821313708794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452C08794AFB00677359 = {
  -			fileRef = A821313808794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452D08794AFB00677359 = {
  -			fileRef = A821313908794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452E08794AFB00677359 = {
  -			fileRef = A821313A08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821452F08794AFB00677359 = {
  -			fileRef = A821313B08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453008794AFB00677359 = {
  -			fileRef = A821313C08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453108794AFB00677359 = {
  -			fileRef = A821313D08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453208794AFB00677359 = {
  -			fileRef = A821313E08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453308794AFB00677359 = {
  -			fileRef = A821313F08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453408794AFB00677359 = {
  -			fileRef = A821314008794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453508794AFB00677359 = {
  -			fileRef = A821314108794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453608794AFB00677359 = {
  -			fileRef = A821314208794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453708794AFB00677359 = {
  -			fileRef = A821314308794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453808794AFB00677359 = {
  -			fileRef = A821314408794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453908794AFB00677359 = {
  -			fileRef = A821314508794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453A08794AFB00677359 = {
  -			fileRef = A821314608794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453B08794AFB00677359 = {
  -			fileRef = A821314708794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453C08794AFB00677359 = {
  -			fileRef = A821314808794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453D08794AFB00677359 = {
  -			fileRef = A821314908794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453E08794AFB00677359 = {
  -			fileRef = A821314A08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821453F08794AFB00677359 = {
  -			fileRef = A821314B08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454008794AFB00677359 = {
  -			fileRef = A821314C08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454108794AFB00677359 = {
  -			fileRef = A821314D08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454208794AFB00677359 = {
  -			fileRef = A821314E08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454308794AFB00677359 = {
  -			fileRef = A821314F08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454408794AFB00677359 = {
  -			fileRef = A821315008794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454508794AFB00677359 = {
  -			fileRef = A821315108794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454608794AFB00677359 = {
  -			fileRef = A821315208794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454708794AFB00677359 = {
  -			fileRef = A821315308794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454808794AFB00677359 = {
  -			fileRef = A821315408794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454908794AFB00677359 = {
  -			fileRef = A821315508794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454A08794AFB00677359 = {
  -			fileRef = A821315608794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454B08794AFB00677359 = {
  -			fileRef = A821315708794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454C08794AFB00677359 = {
  -			fileRef = A821315808794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454D08794AFB00677359 = {
  -			fileRef = A821315908794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454E08794AFB00677359 = {
  -			fileRef = A821315A08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821454F08794AFB00677359 = {
  -			fileRef = A821315B08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455008794AFB00677359 = {
  -			fileRef = A821315C08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455108794AFB00677359 = {
  -			fileRef = A821315D08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455208794AFB00677359 = {
  -			fileRef = A821315E08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455308794AFB00677359 = {
  -			fileRef = A821315F08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455408794AFB00677359 = {
  -			fileRef = A821316008794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455508794AFB00677359 = {
  -			fileRef = A821316108794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455608794AFB00677359 = {
  -			fileRef = A821316208794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455708794AFB00677359 = {
  -			fileRef = A821316308794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455808794AFB00677359 = {
  -			fileRef = A821316408794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455908794AFB00677359 = {
  -			fileRef = A821316508794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455A08794AFB00677359 = {
  -			fileRef = A821316608794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455B08794AFB00677359 = {
  -			fileRef = A821316708794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455C08794AFB00677359 = {
  -			fileRef = A821316808794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455D08794AFB00677359 = {
  -			fileRef = A821316908794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455E08794AFB00677359 = {
  -			fileRef = A821316A08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821455F08794AFB00677359 = {
  -			fileRef = A821316B08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456008794AFB00677359 = {
  -			fileRef = A821316C08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456108794AFB00677359 = {
  -			fileRef = A821316D08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456208794AFB00677359 = {
  -			fileRef = A821316E08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456308794AFB00677359 = {
  -			fileRef = A821316F08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456408794AFB00677359 = {
  -			fileRef = A821317008794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456508794AFB00677359 = {
  -			fileRef = A821317108794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456608794AFB00677359 = {
  -			fileRef = A821317208794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456708794AFB00677359 = {
  -			fileRef = A821317308794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456808794AFB00677359 = {
  -			fileRef = A821317408794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456908794AFB00677359 = {
  -			fileRef = A821317508794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456A08794AFB00677359 = {
  -			fileRef = A821317608794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456B08794AFB00677359 = {
  -			fileRef = A821317708794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456C08794AFB00677359 = {
  -			fileRef = A821317808794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456D08794AFB00677359 = {
  -			fileRef = A821317908794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456E08794AFB00677359 = {
  -			fileRef = A821317A08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821456F08794AFB00677359 = {
  -			fileRef = A821317B08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457008794AFB00677359 = {
  -			fileRef = A821317C08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457108794AFB00677359 = {
  -			fileRef = A821317D08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457208794AFB00677359 = {
  -			fileRef = A821317E08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457308794AFB00677359 = {
  -			fileRef = A821317F08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457408794AFB00677359 = {
  -			fileRef = A821318008794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457508794AFB00677359 = {
  -			fileRef = A821318108794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457608794AFB00677359 = {
  -			fileRef = A821318208794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457708794AFB00677359 = {
  -			fileRef = A821318308794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457808794AFB00677359 = {
  -			fileRef = A821318408794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457908794AFB00677359 = {
  -			fileRef = A821318508794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457A08794AFB00677359 = {
  -			fileRef = A821318608794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457B08794AFB00677359 = {
  -			fileRef = A821318708794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457C08794AFB00677359 = {
  -			fileRef = A821318808794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457D08794AFB00677359 = {
  -			fileRef = A821318908794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457E08794AFB00677359 = {
  -			fileRef = A821318A08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821457F08794AFB00677359 = {
  -			fileRef = A821318B08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458008794AFB00677359 = {
  -			fileRef = A821318C08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458108794AFB00677359 = {
  -			fileRef = A821318D08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458208794AFB00677359 = {
  -			fileRef = A821318E08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458308794AFB00677359 = {
  -			fileRef = A821318F08794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458408794AFB00677359 = {
  -			fileRef = A821319008794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458508794AFB00677359 = {
  -			fileRef = A821319108794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458608794AFB00677359 = {
  -			fileRef = A821319208794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458708794AFB00677359 = {
  -			fileRef = A821319308794AC300677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458808794AFB00677359 = {
  -			fileRef = A821319408794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458908794AFB00677359 = {
  -			fileRef = A821319508794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458A08794AFB00677359 = {
  -			fileRef = A821319608794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458B08794AFB00677359 = {
  -			fileRef = A821319708794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458C08794AFB00677359 = {
  -			fileRef = A821319808794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458D08794AFB00677359 = {
  -			fileRef = A821319908794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458E08794AFB00677359 = {
  -			fileRef = A821319B08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821458F08794AFB00677359 = {
  -			fileRef = A821319C08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459008794AFB00677359 = {
  -			fileRef = A821319D08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459108794AFB00677359 = {
  -			fileRef = A821319E08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459208794AFB00677359 = {
  -			fileRef = A821319F08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459308794AFB00677359 = {
  -			fileRef = A82131A008794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459408794AFB00677359 = {
  -			fileRef = A82131A108794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459608794AFB00677359 = {
  -			fileRef = A82131A308794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459808794AFB00677359 = {
  -			fileRef = A82131A708794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459908794AFB00677359 = {
  -			fileRef = A82131A808794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459A08794AFB00677359 = {
  -			fileRef = A82131A908794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459B08794AFB00677359 = {
  -			fileRef = A82131AA08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459C08794AFB00677359 = {
  -			fileRef = A82131AB08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459E08794AFB00677359 = {
  -			fileRef = A82131AD08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821459F08794AFB00677359 = {
  -			fileRef = A82131AE08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A008794AFB00677359 = {
  -			fileRef = A82131AF08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A108794AFB00677359 = {
  -			fileRef = A82131B008794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A208794AFB00677359 = {
  -			fileRef = A82131B208794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A308794AFB00677359 = {
  -			fileRef = A82131B308794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A508794AFB00677359 = {
  -			fileRef = A82131B508794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A608794AFB00677359 = {
  -			fileRef = A82131B608794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A708794AFB00677359 = {
  -			fileRef = A82131B708794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A808794AFB00677359 = {
  -			fileRef = A82131B808794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145A908794AFB00677359 = {
  -			fileRef = A82131B908794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145AA08794AFB00677359 = {
  -			fileRef = A82131BA08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145AB08794AFB00677359 = {
  -			fileRef = A82131BB08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145AC08794AFB00677359 = {
  -			fileRef = A82131BC08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145AD08794AFB00677359 = {
  -			fileRef = A82131BD08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145AE08794AFB00677359 = {
  -			fileRef = A82131BE08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145AF08794AFB00677359 = {
  -			fileRef = A82131BF08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B008794AFB00677359 = {
  -			fileRef = A82131C008794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B108794AFB00677359 = {
  -			fileRef = A82131C108794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B208794AFB00677359 = {
  -			fileRef = A82131C208794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B308794AFB00677359 = {
  -			fileRef = A82131C308794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B408794AFB00677359 = {
  -			fileRef = A82131C408794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B508794AFB00677359 = {
  -			fileRef = A82131C508794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B608794AFB00677359 = {
  -			fileRef = A82131C608794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B708794AFB00677359 = {
  -			fileRef = A82131C708794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B808794AFB00677359 = {
  -			fileRef = A82131C808794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145B908794AFB00677359 = {
  -			fileRef = A82131C908794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145BA08794AFB00677359 = {
  -			fileRef = A82131CA08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145BB08794AFB00677359 = {
  -			fileRef = A82131CB08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145BC08794AFB00677359 = {
  -			fileRef = A82131CC08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145BD08794AFB00677359 = {
  -			fileRef = A82131CD08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145BE08794AFB00677359 = {
  -			fileRef = A82131CE08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145BF08794AFB00677359 = {
  -			fileRef = A82131CF08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C008794AFB00677359 = {
  -			fileRef = A82131D008794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C108794AFB00677359 = {
  -			fileRef = A82131D108794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C208794AFB00677359 = {
  -			fileRef = A82131D208794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C308794AFB00677359 = {
  -			fileRef = A82131D308794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C408794AFB00677359 = {
  -			fileRef = A82131D408794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C508794AFB00677359 = {
  -			fileRef = A82131D508794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C608794AFB00677359 = {
  -			fileRef = A82131D608794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C708794AFB00677359 = {
  -			fileRef = A82131D708794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C808794AFB00677359 = {
  -			fileRef = A82131D808794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145C908794AFC00677359 = {
  -			fileRef = A82131D908794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145CA08794AFC00677359 = {
  -			fileRef = A82131DA08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145CB08794AFC00677359 = {
  -			fileRef = A82131DB08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145CC08794AFC00677359 = {
  -			fileRef = A82131DC08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145CD08794AFC00677359 = {
  -			fileRef = A82131DD08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145CF08794AFC00677359 = {
  -			fileRef = A82131DF08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D008794AFC00677359 = {
  -			fileRef = A82131E008794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D108794AFC00677359 = {
  -			fileRef = A82131E108794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D208794AFC00677359 = {
  -			fileRef = A82131E208794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D308794AFC00677359 = {
  -			fileRef = A82131E308794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D408794AFC00677359 = {
  -			fileRef = A82131E408794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D508794AFC00677359 = {
  -			fileRef = A82131E508794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D608794AFC00677359 = {
  -			fileRef = A82131E608794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D708794AFC00677359 = {
  -			fileRef = A82131E708794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D808794AFC00677359 = {
  -			fileRef = A82131E808794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145D908794AFC00677359 = {
  -			fileRef = A82131E908794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145DA08794AFC00677359 = {
  -			fileRef = A82131EA08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145DB08794AFC00677359 = {
  -			fileRef = A82131EB08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145DC08794AFC00677359 = {
  -			fileRef = A82131EC08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145DD08794AFC00677359 = {
  -			fileRef = A82131ED08794AC400677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145DE08794AFC00677359 = {
  -			fileRef = A82131EE08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145DF08794AFC00677359 = {
  -			fileRef = A82131EF08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E008794AFC00677359 = {
  -			fileRef = A82131F008794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E108794AFC00677359 = {
  -			fileRef = A82131F108794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E208794AFC00677359 = {
  -			fileRef = A82131F208794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E308794AFC00677359 = {
  -			fileRef = A82131F308794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E408794AFC00677359 = {
  -			fileRef = A82131F408794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E508794AFC00677359 = {
  -			fileRef = A82131F508794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E608794AFC00677359 = {
  -			fileRef = A82131F608794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E708794AFC00677359 = {
  -			fileRef = A82131F708794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E808794AFC00677359 = {
  -			fileRef = A82131F808794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145E908794AFC00677359 = {
  -			fileRef = A82131F908794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145EA08794AFC00677359 = {
  -			fileRef = A82131FA08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145EB08794AFC00677359 = {
  -			fileRef = A82131FB08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145EC08794AFC00677359 = {
  -			fileRef = A82131FC08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145ED08794AFC00677359 = {
  -			fileRef = A82131FD08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145EE08794AFC00677359 = {
  -			fileRef = A82131FE08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145EF08794AFC00677359 = {
  -			fileRef = A82131FF08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F008794AFC00677359 = {
  -			fileRef = A821320008794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F108794AFC00677359 = {
  -			fileRef = A821320108794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F208794AFC00677359 = {
  -			fileRef = A821320208794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F308794AFC00677359 = {
  -			fileRef = A821320308794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F408794AFC00677359 = {
  -			fileRef = A821320408794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F508794AFC00677359 = {
  -			fileRef = A821320508794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F608794AFC00677359 = {
  -			fileRef = A821320608794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F708794AFC00677359 = {
  -			fileRef = A821320708794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F808794AFC00677359 = {
  -			fileRef = A821320808794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145F908794AFC00677359 = {
  -			fileRef = A821320908794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145FA08794AFC00677359 = {
  -			fileRef = A821320A08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145FB08794AFC00677359 = {
  -			fileRef = A821320B08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145FC08794AFC00677359 = {
  -			fileRef = A821320C08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145FD08794AFC00677359 = {
  -			fileRef = A821320D08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145FE08794AFC00677359 = {
  -			fileRef = A821320E08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A82145FF08794AFC00677359 = {
  -			fileRef = A821320F08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460008794AFC00677359 = {
  -			fileRef = A821321008794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460108794AFC00677359 = {
  -			fileRef = A821321108794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460208794AFC00677359 = {
  -			fileRef = A821321208794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460308794AFC00677359 = {
  -			fileRef = A821321308794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460408794AFC00677359 = {
  -			fileRef = A821321408794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460508794AFC00677359 = {
  -			fileRef = A821321508794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460608794AFC00677359 = {
  -			fileRef = A821321608794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460708794AFC00677359 = {
  -			fileRef = A821321708794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460808794AFC00677359 = {
  -			fileRef = A821321808794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460908794AFC00677359 = {
  -			fileRef = A821321908794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460A08794AFC00677359 = {
  -			fileRef = A821321A08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460B08794AFC00677359 = {
  -			fileRef = A821321B08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460C08794AFC00677359 = {
  -			fileRef = A821321C08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460D08794AFC00677359 = {
  -			fileRef = A821321D08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460E08794AFC00677359 = {
  -			fileRef = A821321E08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821460F08794AFC00677359 = {
  -			fileRef = A821321F08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461008794AFC00677359 = {
  -			fileRef = A821322008794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461108794AFC00677359 = {
  -			fileRef = A821322108794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461208794AFC00677359 = {
  -			fileRef = A821322208794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461308794AFC00677359 = {
  -			fileRef = A821322308794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461408794AFC00677359 = {
  -			fileRef = A821322408794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461508794AFC00677359 = {
  -			fileRef = A821322508794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461608794AFC00677359 = {
  -			fileRef = A821322608794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461708794AFC00677359 = {
  -			fileRef = A821322708794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461808794AFC00677359 = {
  -			fileRef = A821322808794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461908794AFC00677359 = {
  -			fileRef = A821322908794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461A08794AFC00677359 = {
  -			fileRef = A821322A08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461B08794AFC00677359 = {
  -			fileRef = A821322B08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461C08794AFC00677359 = {
  -			fileRef = A821322C08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461D08794AFC00677359 = {
  -			fileRef = A821322D08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461E08794AFC00677359 = {
  -			fileRef = A821322E08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821461F08794AFC00677359 = {
  -			fileRef = A821322F08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462008794AFC00677359 = {
  -			fileRef = A821323008794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462108794AFC00677359 = {
  -			fileRef = A821323108794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462208794AFC00677359 = {
  -			fileRef = A821323208794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462308794AFC00677359 = {
  -			fileRef = A821323308794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462408794AFC00677359 = {
  -			fileRef = A821323408794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462508794AFC00677359 = {
  -			fileRef = A821323508794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462608794AFC00677359 = {
  -			fileRef = A821323608794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462708794AFC00677359 = {
  -			fileRef = A821323708794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462808794AFC00677359 = {
  -			fileRef = A821323808794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462908794AFC00677359 = {
  -			fileRef = A821323908794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462A08794AFC00677359 = {
  -			fileRef = A821323A08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462B08794AFC00677359 = {
  -			fileRef = A821323B08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462C08794AFC00677359 = {
  -			fileRef = A821323C08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462D08794AFC00677359 = {
  -			fileRef = A821323D08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462E08794AFC00677359 = {
  -			fileRef = A821323E08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821462F08794AFC00677359 = {
  -			fileRef = A821323F08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463008794AFC00677359 = {
  -			fileRef = A821324008794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463108794AFC00677359 = {
  -			fileRef = A821324108794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463208794AFC00677359 = {
  -			fileRef = A821324208794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463308794AFC00677359 = {
  -			fileRef = A821324308794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463408794AFC00677359 = {
  -			fileRef = A821324408794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463508794AFC00677359 = {
  -			fileRef = A821324508794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463608794AFC00677359 = {
  -			fileRef = A821324608794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463708794AFC00677359 = {
  -			fileRef = A821324708794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463808794AFC00677359 = {
  -			fileRef = A821324808794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463908794AFD00677359 = {
  -			fileRef = A821324908794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463A08794AFD00677359 = {
  -			fileRef = A821324A08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463B08794AFD00677359 = {
  -			fileRef = A821324B08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463C08794AFD00677359 = {
  -			fileRef = A821324C08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463D08794AFD00677359 = {
  -			fileRef = A821324D08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463E08794AFD00677359 = {
  -			fileRef = A821324E08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821463F08794AFD00677359 = {
  -			fileRef = A821324F08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464008794AFD00677359 = {
  -			fileRef = A821325008794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464108794AFD00677359 = {
  -			fileRef = A821325108794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464208794AFD00677359 = {
  -			fileRef = A821325208794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464308794AFD00677359 = {
  -			fileRef = A821325308794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464408794AFD00677359 = {
  -			fileRef = A821325408794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464508794AFD00677359 = {
  -			fileRef = A821325508794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464608794AFD00677359 = {
  -			fileRef = A821325608794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464708794AFD00677359 = {
  -			fileRef = A821325708794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464808794AFD00677359 = {
  -			fileRef = A821325808794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464908794AFD00677359 = {
  -			fileRef = A821325908794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464A08794AFD00677359 = {
  -			fileRef = A821325A08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464B08794AFD00677359 = {
  -			fileRef = A821325B08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464C08794AFD00677359 = {
  -			fileRef = A821325C08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464D08794AFD00677359 = {
  -			fileRef = A821325D08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464E08794AFD00677359 = {
  -			fileRef = A821325E08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821464F08794AFD00677359 = {
  -			fileRef = A821325F08794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465008794AFD00677359 = {
  -			fileRef = A821326008794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465108794AFD00677359 = {
  -			fileRef = A821326108794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465208794AFD00677359 = {
  -			fileRef = A821326208794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465308794AFD00677359 = {
  -			fileRef = A821326308794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465408794AFD00677359 = {
  -			fileRef = A821326408794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465508794AFD00677359 = {
  -			fileRef = A821326508794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465608794AFD00677359 = {
  -			fileRef = A821326608794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465708794AFD00677359 = {
  -			fileRef = A821326708794AC500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465808794AFD00677359 = {
  -			fileRef = A821326808794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465908794AFD00677359 = {
  -			fileRef = A821326908794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465A08794AFD00677359 = {
  -			fileRef = A821326A08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465B08794AFD00677359 = {
  -			fileRef = A821326B08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465C08794AFD00677359 = {
  -			fileRef = A821326C08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465D08794AFD00677359 = {
  -			fileRef = A821326D08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465E08794AFD00677359 = {
  -			fileRef = A821326E08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821465F08794AFD00677359 = {
  -			fileRef = A821326F08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466008794AFD00677359 = {
  -			fileRef = A821327008794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466108794AFD00677359 = {
  -			fileRef = A821327108794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466208794AFD00677359 = {
  -			fileRef = A821327208794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466308794AFD00677359 = {
  -			fileRef = A821327308794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466408794AFD00677359 = {
  -			fileRef = A821327408794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466508794AFD00677359 = {
  -			fileRef = A821327508794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466608794AFD00677359 = {
  -			fileRef = A821327608794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466708794AFD00677359 = {
  -			fileRef = A821327708794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466808794AFD00677359 = {
  -			fileRef = A821327808794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466908794AFD00677359 = {
  -			fileRef = A821327908794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466A08794AFD00677359 = {
  -			fileRef = A821327A08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466B08794AFD00677359 = {
  -			fileRef = A821327B08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466C08794AFD00677359 = {
  -			fileRef = A821327C08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466D08794AFD00677359 = {
  -			fileRef = A821327D08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466E08794AFD00677359 = {
  -			fileRef = A821327E08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821466F08794AFD00677359 = {
  -			fileRef = A821327F08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467008794AFD00677359 = {
  -			fileRef = A821328008794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467108794AFD00677359 = {
  -			fileRef = A821328108794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467208794AFD00677359 = {
  -			fileRef = A821328208794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467308794AFD00677359 = {
  -			fileRef = A821328308794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467408794AFD00677359 = {
  -			fileRef = A821328408794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467508794AFD00677359 = {
  -			fileRef = A821328508794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467708794AFD00677359 = {
  -			fileRef = A821328708794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467808794AFD00677359 = {
  -			fileRef = A821328808794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467908794AFD00677359 = {
  -			fileRef = A821328908794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467A08794AFD00677359 = {
  -			fileRef = A821328A08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467B08794AFD00677359 = {
  -			fileRef = A821328B08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467C08794AFD00677359 = {
  -			fileRef = A821328C08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467D08794AFD00677359 = {
  -			fileRef = A821328D08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467E08794AFD00677359 = {
  -			fileRef = A821328E08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821467F08794AFD00677359 = {
  -			fileRef = A821328F08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468008794AFD00677359 = {
  -			fileRef = A821329008794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468108794AFD00677359 = {
  -			fileRef = A821329108794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468208794AFD00677359 = {
  -			fileRef = A821329208794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468308794AFD00677359 = {
  -			fileRef = A821329308794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468408794AFD00677359 = {
  -			fileRef = A821329408794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468508794AFD00677359 = {
  -			fileRef = A821329508794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468608794AFD00677359 = {
  -			fileRef = A821329608794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468708794AFD00677359 = {
  -			fileRef = A821329708794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468808794AFD00677359 = {
  -			fileRef = A821329808794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468908794AFD00677359 = {
  -			fileRef = A821329908794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468A08794AFD00677359 = {
  -			fileRef = A821329A08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468B08794AFD00677359 = {
  -			fileRef = A821329B08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468C08794AFD00677359 = {
  -			fileRef = A821329C08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468D08794AFD00677359 = {
  -			fileRef = A821329D08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468E08794AFD00677359 = {
  -			fileRef = A821329E08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821468F08794AFD00677359 = {
  -			fileRef = A821329F08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469008794AFD00677359 = {
  -			fileRef = A82132A008794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469108794AFD00677359 = {
  -			fileRef = A82132A108794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469208794AFD00677359 = {
  -			fileRef = A82132A208794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469308794AFD00677359 = {
  -			fileRef = A82132A308794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469708794AFD00677359 = {
  -			fileRef = A82132A708794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469808794AFD00677359 = {
  -			fileRef = A82132A808794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469908794AFD00677359 = {
  -			fileRef = A82132A908794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469A08794AFD00677359 = {
  -			fileRef = A82132AA08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469B08794AFD00677359 = {
  -			fileRef = A82132AB08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A821469C08794AFD00677359 = {
  -			fileRef = A82132AC08794AC600677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A85D722108795567006A9172 = {
  -			buildActionMask = 2147483647;
  -			files = (
  -			);
  -			inputPaths = (
  -				$CREATE_HASH_TABLE,
  -				kdom/ecma/Ecma.cc,
  -			);
  -			isa = PBXShellScriptBuildPhase;
  -			name = "KDOM .lut.h files";
  -			outputPaths = (
  -				$DERIVED_FILE_DIR/Ecma.lut.h,
  -			);
  -			runOnlyForDeploymentPostprocessing = 0;
  -			shellPath = /bin/sh;
  -			shellScript = "\"$CREATE_HASH_TABLE\" kdom/ecma/Ecma.cc -n KDOM > \"$DERIVED_FILE_DIR/Ecma.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ecma/GlobalObject.cc -n KDOM > \"$DERIVED_FILE_DIR/GlobalObject.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ecma/Constructors.cc -n KDOM > \"$DERIVED_FILE_DIR/Constructors.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/EventTarget.cc -n KDOM > \"$DERIVED_FILE_DIR/EventTarget.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/Event.cc -n KDOM > \"$DERIVED_FILE_DIR/Event.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/EventException.cc -n KDOM > \"$DERIVED_FILE_DIR/EventException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/DocumentEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/UIEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/UIEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/MouseEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/MouseEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/KeyboardEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/Keyboa
 rdEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/events/MutationEvent.cc -n KDOM > \"$DERIVED_FILE_DIR/MutationEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/views/AbstractView.cc -n KDOM > \"$DERIVED_FILE_DIR/AbstractView.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/views/DocumentView.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentView.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/StyleSheet.cc -n KDOM > \"$DERIVED_FILE_DIR/StyleSheet.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/StyleSheetList.cc -n KDOM > \"$DERIVED_FILE_DIR/StyleSheetList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/DocumentStyle.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentStyle.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSStyleSheet.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSStyleSheet.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/MediaList.cc -n KDOM > \"$DERIVED_FILE_DIR/MediaList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSRuleList.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSRuleList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSRule.cc -n KDOM > \"$DERIVED_FIL
 E_DIR/CSSRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSStyleRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSStyleRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSMediaRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSMediaRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSFontFaceRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSFontFaceRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSPageRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSPageRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSImportRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSImportRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSCharsetRule.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSCharsetRule.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSStyleDeclaration.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSStyleDeclaration.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSValue.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSValue.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSPrimitiveValue.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSPrimitiveValue.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/CSSValue
 List.cc -n KDOM > \"$DERIVED_FILE_DIR/CSSValueList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/RGBColor.cc -n KDOM > \"$DERIVED_FILE_DIR/RGBColor.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/Rect.cc -n KDOM > \"$DERIVED_FILE_DIR/Rect.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/css/Counter.cc -n KDOM > \"$DERIVED_FILE_DIR/Counter.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSParser.cc -n KDOM > \"$DERIVED_FILE_DIR/LSParser.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSParserFilter.cc -n KDOM > \"$DERIVED_FILE_DIR/LSParserFilter.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSInput.cc -n KDOM > \"$DERIVED_FILE_DIR/LSInput.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSOutput.cc -n KDOM > \"$DERIVED_FILE_DIR/LSOutput.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSSerializer.cc -n KDOM > \"$DERIVED_FILE_DIR/LSSerializer.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSResourceResolver.cc -n KDOM > \"$DERIVED_FILE_DIR/LSResourceResolver.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSSerializerFilter.cc -n KDOM > \"$DERIVED_FILE_
 DIR/LSSerializerFilter.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ls/LSException.cc -n KDOM > \"$DERIVED_FILE_DIR/LSException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/traversal/NodeFilter.cc -n KDOM > \"$DERIVED_FILE_DIR/NodeFilter.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/traversal/NodeIterator.cc -n KDOM > \"$DERIVED_FILE_DIR/NodeIterator.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/traversal/TreeWalker.cc -n KDOM > \"$DERIVED_FILE_DIR/TreeWalker.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/traversal/DocumentTraversal.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentTraversal.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/range/Range.cc -n KDOM > \"$DERIVED_FILE_DIR/Range.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/range/RangeException.cc -n KDOM > \"$DERIVED_FILE_DIR/RangeException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/range/DocumentRange.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentRange.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Attr.cc -n KDOM > \"$DERIVED_FILE_DIR/Attr.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Node.cc -n KDOM > \"$DERIVED
 _FILE_DIR/Node.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Text.cc -n KDOM > \"$DERIVED_FILE_DIR/Text.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Entity.cc -n KDOM > \"$DERIVED_FILE_DIR/Entity.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Element.cc -n KDOM > \"$DERIVED_FILE_DIR/Element.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Notation.cc -n KDOM > \"$DERIVED_FILE_DIR/Notation.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/Document.cc -n KDOM > \"$DERIVED_FILE_DIR/Document.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/NodeList.cc -n KDOM > \"$DERIVED_FILE_DIR/NodeList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DocumentType.cc -n KDOM > \"$DERIVED_FILE_DIR/DocumentType.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/NamedNodeMap.cc -n KDOM > \"$DERIVED_FILE_DIR/NamedNodeMap.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMException.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/CharacterData.cc -n KDOM > \"$DERIVED_FILE_DIR/CharacterData.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMImplementation.cc -n KDOM > \"$DER
 IVED_FILE_DIR/DOMImplementation.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/ProcessingInstruction.cc -n KDOM > \"$DERIVED_FILE_DIR/ProcessingInstruction.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMStringList.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMStringList.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMUserData.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMUserData.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMConfiguration.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMConfiguration.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMLocator.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMLocator.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMError.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMError.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/DOMErrorHandler.cc -n KDOM > \"$DERIVED_FILE_DIR/DOMErrorHandler.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/TypeInfo.cc -n KDOM > \"$DERIVED_FILE_DIR/TypeInfo.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathNamespace.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathNamespace.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathException.cc -n KDOM > 
 \"$DERIVED_FILE_DIR/XPathException.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathNSResolver.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathNSResolver.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathResult.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathResult.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathExpression.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathExpression.lut.h\"\n\"$CREATE_HASH_TABLE\" kdom/xpath/XPathEvaluator.cc -n KDOM > \"$DERIVED_FILE_DIR/XPathEvaluator.lut.h\"";
  -		};
  -		A85D722A087955F6006A9172 = {
  -			buildActionMask = 2147483647;
  -			files = (
  -			);
  -			inputPaths = (
  -				$CREATE_HASH_TABLE,
  -				ksvg2/events/SVGEvent.cc,
  -			);
  -			isa = PBXShellScriptBuildPhase;
  -			name = "KSVG2 .lut.h files";
  -			outputPaths = (
  -				$DERIVED_FILE_DIR/SVGEvent.lut.h,
  -			);
  -			runOnlyForDeploymentPostprocessing = 0;
  -			shellPath = /bin/sh;
  -			shellScript = "\"$CREATE_HASH_TABLE\" ksvg2/events/SVGEvent.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/events/SVGZoomEvent.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGZoomEvent.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/ecma/Constructors.cc -n KSVG > \"$DERIVED_FILE_DIR/KSVG2Constructors.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/ecma/GlobalObject.cc -n KSVG > \"$DERIVED_FILE_DIR/KSVG2GlobalObject.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGException.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGException.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGColor.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGColor.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPaint.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPaint.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLength.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLength.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGDocument.cc -n KSVG > \"$DERIVED_FILE_DI
 R/SVGDocument.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTitleElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTitleElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGDescElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGDescElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGStylable.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGStylable.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGSVGElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGSVGElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGRectElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGRectElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLineElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLineElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGCircleElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGCircleElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGEllipseElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGEllipseElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGScriptElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGScriptElement.lut.h\"\n\"$CREATE_HAS
 H_TABLE\" ksvg2/dom/SVGStyleElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGStyleElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGURIReference.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGURIReference.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLangSpace.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLangSpace.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLocatable.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLocatable.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGRect.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGRect.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGMatrix.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGMatrix.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedString.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedString.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAngle.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAngle.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPoint.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPoint.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPointList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPointList.lut.h\"\n\"
 $CREATE_HASH_TABLE\" ksvg2/dom/SVGElementInstanceList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGElementInstanceList.lut.h\";\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedPoints.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedPoints.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPolylineElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPolylineElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPolygonElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPolygonElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGGElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGGElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGStringList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGStringList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTests.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTests.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGExternalResourcesRequired.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGExternalResourcesRequired.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedBoolean.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedBoolean.lu
 t.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTransform.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTransform.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTransformList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTransformList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedTransformList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedTransformList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTransformable.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTransformable.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGNumber.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGNumber.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedLength.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedLength.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedAngle.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedAngle.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedNumber.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedNumber.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGDefsElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGDefsElement.lut.h\"\n\"$CREA
 TE_HASH_TABLE\" ksvg2/dom/SVGStopElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGStopElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedEnumeration.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedEnumeration.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGGradientElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGGradientElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLinearGradientElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLinearGradientElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGRadialGradientElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGRadialGradientElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSeg.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSeg.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegMoveto.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegMoveto.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegLineto.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegLineto.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegLinetoHorizontal.cc -n KSVG > \"$DERIVED_FILE_DIR
 /SVGPathSegLinetoHorizontal.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegLinetoVertical.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegLinetoVertical.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegArc.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegArc.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegCurvetoCubic.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegCurvetoCubic.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegCurvetoCubicSmooth.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegCurvetoCubicSmooth.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegCurvetoQuadratic.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegCurvetoQuadratic.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegCurvetoQuadraticSmooth.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathSegCurvetoQuadraticSmooth.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedRect.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedRect.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFitToViewBox.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFitToVie
 wBox.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGZoomAndPan.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGZoomAndPan.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPreserveAspectRatio.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPreserveAspectRatio.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedPreserveAspectRatio.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedPreserveAspectRatio.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGImageElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGImageElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPathElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGClipPathElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGClipPathElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGSymbolElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGSymbolElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGSwitchElement.cc -n KSVG > \"$DERIVED_FILE_DI
 R/SVGSwitchElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGUseElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGUseElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPatternElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGPatternElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGElementInstance.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGElementInstance.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimationElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimationElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimateColorElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimateColorElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimateTransformElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimateTransformElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimateElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimateElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGSetElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGSetElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGPathSegList.cc -n K
 SVG > \"$DERIVED_FILE_DIR/SVGPathSegList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedPathData.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedPathData.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGMarkerElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGMarkerElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGViewElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGViewElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGLengthList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGLengthList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedLengthList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedLengthList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedInteger.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedInteger.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFilterElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFilterElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEGaussianBlurElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEGaussianBlurElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEBle
 ndElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEBlendElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEFloodElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEFloodElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFETileElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFETileElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEMergeElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEMergeElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEMergeNodeElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEMergeNodeElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEOffsetElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEOffsetElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEComponentTransferElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEComponentTransferElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGComponentTransferFunctionElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGComponentTransferFunctionElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFECompositeElement.cc -n KSVG > \"$DER
 IVED_FILE_DIR/SVGFECompositeElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEColorMatrixElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEColorMatrixElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFEImageElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFEImageElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFETurbulenceElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFETurbulenceElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGFilterPrimitiveStandardAttributes.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGFilterPrimitiveStandardAttributes.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGNumberList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGNumberList.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTextElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTextElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTSpanElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTSpanElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGTextContentElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTextContentElement.lut.h\"\n\"$CRE
 ATE_HASH_TABLE\" ksvg2/dom/SVGTextPositioningElement.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGTextPositioningElement.lut.h\"\n\"$CREATE_HASH_TABLE\" ksvg2/dom/SVGAnimatedNumberList.cc -n KSVG > \"$DERIVED_FILE_DIR/SVGAnimatedNumberList.lut.h\"";
  -		};
  -		A85D722E087956C0006A9172 = {
  -			buildActionMask = 2147483647;
  -			files = (
  -			);
  -			inputPaths = (
  -				kdom/css/impl/cssproperties.in,
  -				kdom/scripts/cssmakeprops,
  -			);
  -			isa = PBXShellScriptBuildPhase;
  -			name = kdomcssproperties.c/h;
  -			outputPaths = (
  -				$DERIVED_FILE_DIR/kdomcssproperties.c,
  -				$DERIVED_FILE_DIR/kdomcssproperties.h,
  -			);
  -			runOnlyForDeploymentPostprocessing = 0;
  -			shellPath = /bin/sh;
  -			shellScript = "cat kdom/css/impl/cssproperties.in > \"$DERIVED_FILE_DIR/kdomcssproperties.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakeprops\" -n KDOM -f kdomcssproperties.in";
  -		};
  -		A85D72340879573B006A9172 = {
  -			buildActionMask = 2147483647;
  -			files = (
  -			);
  -			inputPaths = (
  -				kdom/css/impl/cssvalues.in,
  -				kdom/scripts/cssmakevalues,
  -			);
  -			isa = PBXShellScriptBuildPhase;
  -			name = kdomcssvalues.c/h;
  -			outputPaths = (
  -				$DERIVED_FILE_DIR/kdomcssvalues.c,
  -				$DERIVED_FILE_DIR/kdomcssvalues.h,
  -			);
  -			runOnlyForDeploymentPostprocessing = 0;
  -			shellPath = /bin/sh;
  -			shellScript = "cat kdom/css/impl/cssvalues.in > \"$DERIVED_FILE_DIR/kdomcssvalues.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakevalues\" -n KDOM -f kdomcssvalues.in";
  -		};
  -		A85D723A0879577B006A9172 = {
  -			buildActionMask = 2147483647;
  -			files = (
  -			);
  -			inputPaths = (
  -				ksvg2/css/impl/cssproperties.in,
  -				kdom/scripts/cssmakeprops,
  -			);
  -			isa = PBXShellScriptBuildPhase;
  -			name = ksvgcssproperties.c/h;
  -			outputPaths = (
  -				$DERIVED_FILE_DIR/ksvgcssproperties.c,
  -				$DERIVED_FILE_DIR/ksvgcssproperties.h,
  -			);
  -			runOnlyForDeploymentPostprocessing = 0;
  -			shellPath = /bin/sh;
  -			shellScript = "cat ksvg2/css/impl/cssproperties.in > \"$DERIVED_FILE_DIR/ksvgcssproperties.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakeprops\" -n KSVG -f ksvgcssproperties.in";
  -		};
  -		A85D7240087957D1006A9172 = {
  -			buildActionMask = 2147483647;
  -			files = (
  -			);
  -			inputPaths = (
  -				ksvg2/css/impl/cssvalues.in,
  -				kdom/scripts/cssmakevalues,
  -			);
  -			isa = PBXShellScriptBuildPhase;
  -			name = ksvgcssvalues.c/h;
  -			outputPaths = (
  -				$DERIVED_FILE_DIR/ksvgcssvalues.c,
  -				$DERIVED_FILE_DIR/ksvgcssvalues.h,
  -			);
  -			runOnlyForDeploymentPostprocessing = 0;
  -			shellPath = /bin/sh;
  -			shellScript = "cat ksvg2/css/impl/cssvalues.in > \"$DERIVED_FILE_DIR/ksvgcssvalues.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakevalues\" -n KSVG -f ksvgcssvalues.in";
  -		};
  -		A85D7A2F0879EBA9006A9172 = {
  -			isa = PBXFileReference;
  -			lastKnownFileType = wrapper.framework;
  -			name = QuartzCore.framework;
  -			path = /System/Library/Frameworks/QuartzCore.framework;
  -			refType = 0;
  -			sourceTree = "<absolute>";
  -		};
  -		A85D7A300879EBA9006A9172 = {
  -			fileRef = A85D7A2F0879EBA9006A9172;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A85D7A8C0879EC64006A9172 = {
  -			fileEncoding = 30;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.objcpp;
  -			path = KWQWMatrix.mm;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A85D7A8D0879EC64006A9172 = {
  -			fileEncoding = 30;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = KWQWMatrix.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		A85D7A8E0879EC64006A9172 = {
  -			fileRef = A85D7A8C0879EC64006A9172;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A85D7A8F0879EC64006A9172 = {
  -			fileRef = A85D7A8D0879EC64006A9172;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A85D7AA8087A0C4C006A9172 = {
  -			fileRef = A8212D5808794AB500677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A85D7AAC087A0C58006A9172 = {
  -			fileRef = A821305308794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A85D7AAD087A0C60006A9172 = {
  -			fileRef = A821305208794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A85D7BA4087A6616006A9172 = {
  -			fileRef = A821305108794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A85D7BA5087A6621006A9172 = {
  -			fileRef = A821305408794AC000677359;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A898F147088121E90075EFB2 = {
  -			fileRef = BCEF3433087B563E00BBF833;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A898F148088121ED0075EFB2 = {
  -			fileRef = BCEF3432087B563E00BBF833;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A8FD8B86087CB44C00DC3707 = {
  -			fileRef = A85D7A8C0879EC64006A9172;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -		A8FD8B87087CB45700DC3707 = {
  -			fileRef = A85D7A8D0879EC64006A9172;
  -			isa = PBXBuildFile;
  -			settings = {
  -			};
  -		};
  -//A80
  -//A81
  -//A82
  -//A83
  -//A84
  -//BC0
  -//BC1
  -//BC2
  -//BC3
  -//BC4
  -		BC06F24406D18A35004A6FA3 = {
  -			children = (
  -				BC06F24906D18A7E004A6FA3,
  -				BC06F24A06D18A7E004A6FA3,
  -				BC06F24B06D18A7E004A6FA3,
  -				BC06F24C06D18A7E004A6FA3,
  -			);
  -			isa = PBXGroup;
  -			name = xsl;
  -			path = khtml;
  -			refType = 2;
  -			sourceTree = SOURCE_ROOT;
  -		};
  -		BC06F24906D18A7E004A6FA3 = {
  -			fileEncoding = 30;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			name = xsl_stylesheetimpl.cpp;
  -			path = xsl/xsl_stylesheetimpl.cpp;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		BC06F24A06D18A7E004A6FA3 = {
  -			fileEncoding = 30;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			name = xsl_stylesheetimpl.h;
  -			path = xsl/xsl_stylesheetimpl.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		BC06F24B06D18A7E004A6FA3 = {
  -			fileEncoding = 30;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			name = xslt_processorimpl.cpp;
  -			path = xsl/xslt_processorimpl.cpp;
  +			name = xslt_processorimpl.cpp;
  +			path = xsl/xslt_processorimpl.cpp;
   			refType = 4;
   			sourceTree = "<group>";
   		};
  @@ -32166,22 +13872,6 @@
   			refType = 4;
   			sourceTree = "<group>";
   		};
  -		F523D27E02DE43D7018635CA = {
  -			fileEncoding = 30;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.cpp.cpp;
  -			path = htmlhashes.cpp;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
  -		F523D27F02DE43D7018635CA = {
  -			fileEncoding = 30;
  -			isa = PBXFileReference;
  -			lastKnownFileType = sourcecode.c.h;
  -			path = htmlhashes.h;
  -			refType = 4;
  -			sourceTree = "<group>";
  -		};
   		F523D28202DE43D7018635CA = {
   			fileEncoding = 30;
   			isa = PBXFileReference;
  @@ -32253,8 +13943,6 @@
   				65F378280870D958000B2F94,
   				65DE852708765FC30011428A,
   				65DE852808765FC30011428A,
  -				F523D27E02DE43D7018635CA,
  -				F523D27F02DE43D7018635CA,
   				F523D28202DE43D7018635CA,
   				F523D28302DE43D7018635CA,
   				F523D28402DE43D7018635CA,
  
  
  
  1.329     +8 -7      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.328
  retrieving revision 1.329
  diff -u -r1.328 -r1.329
  --- khtml_part.cpp	15 Jul 2005 17:50:50 -0000	1.328
  +++ khtml_part.cpp	18 Jul 2005 21:44:12 -0000	1.329
  @@ -55,7 +55,6 @@
   #include "rendering/render_block.h"
   #include "rendering/render_text.h"
   #include "rendering/render_frames.h"
  -#include "misc/htmlhashes.h"
   #include "misc/loader.h"
   #include "xml/dom2_eventsimpl.h"
   #include "xml/dom2_rangeimpl.h"
  @@ -208,7 +207,9 @@
   void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
   {
     AtomicString::init();
  +  QualifiedName::init();
     HTMLNames::init(); // FIXME: We should make this happen only when HTML is used.
  +  HTMLAttributes::init(); // FIXME: Ditto.
     if ( prof == DefaultGUI )
       setXMLFile( "khtml.rc" );
     else if ( prof == BrowserViewGUI )
  @@ -2981,7 +2982,7 @@
     if (!d->m_doc || !d->m_doc->isHTMLDocument())
       return KURL();
   
  -  QString relURL = static_cast<HTMLDocumentImpl*>(d->m_doc)->body()->getAttribute( ATTR_BACKGROUND ).string();
  +  QString relURL = static_cast<HTMLDocumentImpl*>(d->m_doc)->body()->getAttribute( HTMLAttributes::background() ).string();
   
     return KURL( m_url, relURL );
   }
  @@ -3146,7 +3147,7 @@
   
     // ### frames
     if ( d->m_doc && d->m_doc->isHTMLDocument() && static_cast<HTMLDocumentImpl*>(d->m_doc)->body() && !d->m_bClearing )
  -    bgURL = static_cast<HTMLDocumentImpl*>(d->m_doc)->body()->getAttribute( ATTR_BACKGROUND ).string();
  +    bgURL = static_cast<HTMLDocumentImpl*>(d->m_doc)->body()->getAttribute( HTMLAttributes::background() ).string();
   
     d->m_paSaveBackground->setEnabled( !bgURL.isEmpty() );
   }
  @@ -4773,7 +4774,7 @@
   			if (i) {
   				KMultipleDrag *mdrag = new KMultipleDrag( d->m_view->viewport());
   				mdrag->addDragObject(new QImageDrag(i->currentImage(), 0L));
  -				KURL u( completeURL( khtml::parseURL(i->getAttribute(ATTR_SRC)).string()));
  +				KURL u( completeURL( khtml::parseURL(i->getAttribute(HTMLAttributes::src())).string()));
   				KURLDrag* urlDrag = KURLDrag::newDrag(u, 0L);
   				if (!d->m_referrer.isEmpty())
   					urlDrag->metaData()["referrer"] = d->m_referrer;
  @@ -5738,7 +5739,7 @@
   
           styleElement->ref();
           
  -        styleElement->setAttribute(ATTR_STYLE, d->m_typingStyle->cssText().implementation(), exceptionCode);
  +        styleElement->setAttribute(HTMLAttributes::style(), d->m_typingStyle->cssText().implementation(), exceptionCode);
           assert(exceptionCode == 0);
           
           TextImpl *text = xmlDocImpl()->createEditingTextNode("");
  @@ -5815,7 +5816,7 @@
       CSSMutableStyleDeclarationImpl *mergeStyle = editingStyle();
       if (mergeStyle) {
           currentStyle->merge(mergeStyle);
  -        element->setAttribute(ATTR_STYLE, currentStyle->cssText());
  +        element->setAttribute(HTMLAttributes::style(), currentStyle->cssText());
       }
   }
   
  @@ -5836,7 +5837,7 @@
       if (changed)
           currentStyle->setChanged();
   
  -    element->setAttribute(ATTR_STYLE, currentStyle->cssText());
  +    element->setAttribute(HTMLAttributes::style(), currentStyle->cssText());
   }
   
   #if !APPLE_CHANGES
  
  
  
  1.135     +0 -1      WebCore/khtml/khtmlview.cpp
  
  Index: khtmlview.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- khtmlview.cpp	9 Jul 2005 20:18:59 -0000	1.134
  +++ khtmlview.cpp	18 Jul 2005 21:44:12 -0000	1.135
  @@ -41,7 +41,6 @@
   #include "xml/dom_nodeimpl.h"
   #include "xml/dom2_eventsimpl.h"
   #include "css/cssstyleselector.h"
  -#include "misc/htmlhashes.h"
   #include "misc/helper.h"
   #include "khtml_settings.h"
   #include "khtml_printsettings.h"
  
  
  
  1.17      +8 -14     WebCore/khtml/css/css_base.cpp
  
  Index: css_base.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/css_base.cpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- css_base.cpp	9 Jul 2005 20:19:00 -0000	1.16
  +++ css_base.cpp	18 Jul 2005 21:44:13 -0000	1.17
  @@ -35,7 +35,6 @@
   
   #include "css_stylesheetimpl.h"
   #include "xml/dom_docimpl.h"
  -#include "misc/htmlhashes.h"
   #include "css_valueimpl.h"
   using namespace DOM;
   
  @@ -93,15 +92,9 @@
   
   // --------------------------------------------------------------------------------
   
  -const QualifiedName& CSSSelector::anyTagName()
  -{
  -    static QualifiedName anyName(nullAtom, starAtom, starAtom);
  -    return anyName;
  -}
  -
   void CSSSelector::print(void)
   {
  -    kdDebug( 6080 ) << "[Selector: tag = " <<       tag.localName().string() << ", attr = \"" << attr << "\", match = \"" << match
  +    kdDebug( 6080 ) << "[Selector: tag = " <<       tag.localName().string() << ", attr = \"" << attr.localName().string() << "\", match = \"" << match
   		    << "\" value = \"" << value.string().latin1() << "\" relation = " << (int)relation
   		    << "]" << endl;
       if ( tagHistory )
  @@ -250,12 +243,12 @@
       DOMString str;
       const CSSSelector* cs = this;
       const AtomicString& localName = cs->tag.localName();
  -    if (localName == starAtom && cs->attr == ATTR_ID && cs->match == CSSSelector::Exact)
  +    if (localName == starAtom && cs->match == CSSSelector::Id)
       {
           str = "#";
           str += cs->value.string();
       }
  -    else if (localName == starAtom && cs->attr == ATTR_CLASS && cs->match == CSSSelector::Class)
  +    else if (localName == starAtom && cs->match == CSSSelector::Class)
       {
           str = ".";
           str += cs->value.string();
  @@ -276,12 +269,12 @@
               str = "*";
           else
               str = localName;
  -        if (cs->attr == ATTR_ID && cs->match == CSSSelector::Exact)
  +        if (cs->match == CSSSelector::Id)
           {
               str += "#";
               str += cs->value.string();
           }
  -        else if (cs->attr == ATTR_CLASS && cs->match == CSSSelector::Class)
  +        else if (cs->match == CSSSelector::Class)
           {
               str += ".";
               str += cs->value.string();
  @@ -297,8 +290,9 @@
               str += cs->value.string();
           }
           // optional attribute
  -        if (cs->attr) {
  -            DOMString attrName = getAttrName(cs->attr);
  +        if (cs->hasAttribute()) {
  +            // FIXME: Add support for dumping namespaces.
  +            DOMString attrName = cs->attr.localName();
               str += "[";
               str += attrName;
               switch (cs->match) {
  
  
  
  1.14      +6 -7      WebCore/khtml/css/css_base.h
  
  Index: css_base.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/css_base.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- css_base.h	9 Jul 2005 20:19:00 -0000	1.13
  +++ css_base.h	18 Jul 2005 21:44:13 -0000	1.14
  @@ -74,13 +74,13 @@
       {
       public:
           CSSSelector()
  -            : tagHistory(0), simpleSelector(0), nextSelector(0), attr(0), tag(anyTagName()),
  +            : tagHistory(0), simpleSelector(0), nextSelector(0), attr(anyQName()), tag(anyQName()),
                 relation( Descendant ), match( None ),
                 pseudoId( 0 ), _pseudoType(PseudoNotParsed)
           {}
           
   	CSSSelector(const QualifiedName& qName)
  -	    : tagHistory(0), simpleSelector(0), nextSelector(0), attr(0), tag(qName),
  +	    : tagHistory(0), simpleSelector(0), nextSelector(0), attr(anyQName()), tag(qName),
                 relation( Descendant ), match( None ),
                 pseudoId( 0 ), _pseudoType(PseudoNotParsed)
           {}
  @@ -174,18 +174,17 @@
               return _pseudoType;
           }
   
  -        static const QualifiedName& anyTagName();
  -
  -        bool hasTag() const { return tag != anyTagName(); }
  +        bool hasTag() const { return tag != anyQName(); }
  +        bool hasAttribute() const { return attr != anyQName(); }
   
   	mutable DOM::AtomicString value;
   	CSSSelector* tagHistory;
           CSSSelector* simpleSelector; // Used for :not.
           CSSSelector* nextSelector; // used for ,-chained selectors
  -	Q_UINT32     attr;
   	
  +        QualifiedName attr;
           QualifiedName tag;
  -
  +        
           Relation relation              : 3;
   	mutable Match  match           : 4;
   	unsigned int pseudoId          : 3;
  
  
  
  1.20      +0 -1      WebCore/khtml/css/css_ruleimpl.cpp
  
  Index: css_ruleimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/css_ruleimpl.cpp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- css_ruleimpl.cpp	9 Jul 2005 20:19:00 -0000	1.19
  +++ css_ruleimpl.cpp	18 Jul 2005 21:44:13 -0000	1.20
  @@ -31,7 +31,6 @@
   #include "css/css_ruleimpl.h"
   
   #include "misc/loader.h"
  -#include "misc/htmlattrs.h"
   #include "xml/dom_docimpl.h"
   
   using namespace DOM;
  
  
  
  1.14      +3 -3      WebCore/khtml/css/css_stylesheetimpl.cpp
  
  Index: css_stylesheetimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/css_stylesheetimpl.cpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- css_stylesheetimpl.cpp	9 Jul 2005 20:19:00 -0000	1.13
  +++ css_stylesheetimpl.cpp	18 Jul 2005 21:44:13 -0000	1.14
  @@ -19,7 +19,7 @@
    * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    * Boston, MA 02111-1307, USA.
    *
  - * $Id: css_stylesheetimpl.cpp,v 1.13 2005/07/09 20:19:00 hyatt Exp $
  + * $Id: css_stylesheetimpl.cpp,v 1.14 2005/07/18 21:44:13 hyatt Exp $
    */
   
   //#define CSS_STYLESHEET_DEBUG
  @@ -224,7 +224,7 @@
   const AtomicString& CSSStyleSheetImpl::determineNamespace(const AtomicString& prefix)
   {
       if (prefix.isEmpty())
  -        return emptyAtom; // No namespace. If an element/attribute has a namespace, we won't match it.
  +        return nullAtom; // No namespace. If an element/attribute has a namespace, we won't match it.
       else if (prefix == starAtom)
           return starAtom; // We'll match any namespace.
       else if (m_namespaces) {
  @@ -232,7 +232,7 @@
           if (ns)
               return ns->uri();
       }
  -    return emptyAtom; // Assume we wont match any namespaces.
  +    return nullAtom; // Assume we wont match any namespaces.
   }
   
   bool CSSStyleSheetImpl::parseString(const DOMString &string, bool strict)
  
  
  
  1.100     +4 -1      WebCore/khtml/css/cssparser.cpp
  
  Index: cssparser.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/cssparser.cpp,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- cssparser.cpp	9 Jul 2005 20:19:00 -0000	1.99
  +++ cssparser.cpp	18 Jul 2005 21:44:13 -0000	1.100
  @@ -1497,7 +1497,10 @@
               if ( args->numValues != 1)
                   return false;
               Value *a = args->current();
  -            parsedValue = new CSSPrimitiveValueImpl(domString(a->string), CSSPrimitiveValue::CSS_ATTR);
  +            DOMString attrName = domString(a->string);
  +            if (document()->isHTMLDocument())
  +                attrName = attrName.lower();
  +            parsedValue = new CSSPrimitiveValueImpl(attrName, CSSPrimitiveValue::CSS_ATTR);
           } else if ( val->unit == CSSPrimitiveValue::CSS_IDENT ) {
               // open-quote
               // close-quote
  
  
  
  1.190     +13 -22    WebCore/khtml/css/cssstyleselector.cpp
  
  Index: cssstyleselector.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.cpp,v
  retrieving revision 1.189
  retrieving revision 1.190
  diff -u -r1.189 -r1.190
  --- cssstyleselector.cpp	9 Jul 2005 20:19:00 -0000	1.189
  +++ cssstyleselector.cpp	18 Jul 2005 21:44:13 -0000	1.190
  @@ -42,7 +42,6 @@
   
   #include "misc/khtmllayout.h"
   #include "khtml_settings.h"
  -#include "misc/htmlhashes.h"
   #include "misc/helper.h"
   #include "misc/loader.h"
   
  @@ -542,7 +541,7 @@
           return;
       }
       
  -    const AtomicString& attr = e->getAttribute(ATTR_HREF);
  +    const AtomicString& attr = e->getAttribute(HTMLAttributes::href());
       if (attr.isNull()) {
           pseudoState = PseudoNone;
           return;
  @@ -619,8 +618,8 @@
               (s->focused() == element->focused())) {
               bool classesMatch = true;
               if (s->hasClass()) {
  -                const AtomicString& class1 = element->getAttribute(ATTR_CLASS);
  -                const AtomicString& class2 = s->getAttribute(ATTR_CLASS);
  +                const AtomicString& class1 = element->getAttribute(HTMLAttributes::classAttr());
  +                const AtomicString& class2 = s->getAttribute(HTMLAttributes::classAttr());
                   classesMatch = (class1 == class2);
               }
               
  @@ -1107,7 +1106,7 @@
               return false;
       }
   
  -    if (sel->attr) {
  +    if (sel->hasAttribute()) {
           if (sel->match == CSSSelector::Class) {
               if (!e->hasClass())
                   return false;
  @@ -3045,33 +3044,25 @@
               return;
           }
           
  -        if(!value->isValueList()) return;
  +        if (!value->isValueList()) return;
           CSSValueListImpl *list = static_cast<CSSValueListImpl *>(value);
           int len = list->length();
   
  -        for(int i = 0; i < len; i++) {
  +        for (int i = 0; i < len; i++) {
               CSSValueImpl *item = list->item(i);
  -            if(!item->isPrimitiveValue()) continue;
  +            if (!item->isPrimitiveValue()) continue;
               CSSPrimitiveValueImpl *val = static_cast<CSSPrimitiveValueImpl *>(item);
  -            if(val->primitiveType()==CSSPrimitiveValue::CSS_STRING)
  -            {
  +            if (val->primitiveType()==CSSPrimitiveValue::CSS_STRING)
                   style->setContent(val->getStringValue().implementation(), i != 0);
  +            else if (val->primitiveType()==CSSPrimitiveValue::CSS_ATTR) {
  +                // FIXME: Can a namespace be specified for an attr(foo)?
  +                QualifiedName attr(nullAtom, val->getStringValue().implementation(), nullAtom);
  +                style->setContent(element->getAttribute(attr).implementation(), i != 0);
               }
  -            else if (val->primitiveType()==CSSPrimitiveValue::CSS_ATTR)
  -            {
  -                // FIXME: Should work with generic XML attributes also, and not
  -                // just the hardcoded HTML set.  Can a namespace be specified for
  -                // an attr(foo)?
  -                int attrID = element->getDocument()->attrId(0, val->getStringValue().implementation(), false);
  -                if (attrID)
  -                    style->setContent(element->getAttribute(attrID).implementation(), i != 0);
  -            }
  -            else if (val->primitiveType()==CSSPrimitiveValue::CSS_URI)
  -            {
  +            else if (val->primitiveType()==CSSPrimitiveValue::CSS_URI) {
                   CSSImageValueImpl *image = static_cast<CSSImageValueImpl *>(val);
                   style->setContent(image->image(element->getDocument()->docLoader()), i != 0);
               }
  -
           }
           break;
       }
  
  
  
  1.42      +28 -40    WebCore/khtml/css/parser.y
  
  Index: parser.y
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/parser.y,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- parser.y	9 Jul 2005 20:19:00 -0000	1.41
  +++ parser.y	18 Jul 2005 21:44:13 -0000	1.42
  @@ -32,7 +32,7 @@
   #include <css/css_ruleimpl.h>
   #include <css/css_stylesheetimpl.h>
   #include <css/css_valueimpl.h>
  -#include <misc/htmlhashes.h>
  +#include "htmlnames.h"
   #include "cssparser.h"
      
   #include <assert.h>
  @@ -265,8 +265,7 @@
   %type <value> function
   
   %type <string> element_name
  -
  -%type <attribute> attrib_id
  +%type <string> attr_name
   
   %%
   
  @@ -715,10 +714,10 @@
       HASH {
   	$$ = new CSSSelector();
   	$$->match = CSSSelector::Id;
  -	$$->attr = ATTR_ID;
  -        CSSParser *p = static_cast<CSSParser *>(parser);
  +	CSSParser *p = static_cast<CSSParser *>(parser);
           if (!p->strict)
               $1.lower();
  +        $$->attr = HTMLAttributes::idAttr();
   	$$->value = atomicString($1);
       }
     | class
  @@ -730,66 +729,55 @@
       '.' IDENT {
           $$ = new CSSSelector();
   	$$->match = CSSSelector::Class;
  -	$$->attr = ATTR_CLASS;
  -        CSSParser *p = static_cast<CSSParser *>(parser);
  +	CSSParser *p = static_cast<CSSParser *>(parser);
           if (!p->strict)
               $2.lower();
  +        $$->attr = HTMLAttributes::classAttr();
   	$$->value = atomicString($2);
       }
     ;
   
  -attrib_id:
  +attr_name:
       IDENT maybe_space {
  -	CSSParser *p = static_cast<CSSParser *>(parser);
  +	ParseString& str = $1;
  +        CSSParser *p = static_cast<CSSParser *>(parser);
   	DOM::DocumentImpl *doc = p->document();
  -
  -	QString attr = qString($1);
  -	if ( doc ) {
  -	    if (doc->isHTMLDocument())
  -		attr = attr.lower();
  -	    const DOMString dattr(attr);
  -            $$ = doc->attrId(0, dattr.implementation(), false);
  -	} else {
  -	    $$ = khtml::getAttrID(attr.lower().ascii(), attr.length());
  -	    // this case should never happen - only when loading
  -	    // the default stylesheet - which must not contain unknown attributes
  -	    assert($$ != 0);
  -        }
  +	if (doc && doc->isHTMLDocument())
  +            str.lower();
  +        $$ = str;
       }
       ;
   
   attrib:
  -    '[' maybe_space attrib_id ']' {
  +    '[' maybe_space attr_name ']' {
   	$$ = new CSSSelector();
  -	$$->attr = $3;
  +	$$->attr = QualifiedName(nullAtom, atomicString($3), nullAtom);
   	$$->match = CSSSelector::Set;
       }
  -    | '[' maybe_space attrib_id match maybe_space ident_or_string maybe_space ']' {
  +    | '[' maybe_space attr_name match maybe_space ident_or_string maybe_space ']' {
   	$$ = new CSSSelector();
  -	$$->attr = $3;
  +	$$->attr = QualifiedName(nullAtom, atomicString($3), nullAtom);
   	$$->match = (CSSSelector::Match)$4;
   	$$->value = atomicString($6);
       }
  -    | '[' maybe_space namespace_selector '|' attrib_id ']' {
  +    | '[' maybe_space namespace_selector '|' attr_name ']' {
  +        AtomicString namespacePrefix = atomicString($3);
  +        CSSParser *p = static_cast<CSSParser *>(parser);
           $$ = new CSSSelector();
  -        $$->attr = $5;
  +        $$->attr = QualifiedName(namespacePrefix,
  +                                 atomicString($5),
  +                                 static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(namespacePrefix));
           $$->match = CSSSelector::Set;
  -        // FIXME: For now we're breaking namespace support on attributes.  When we switch to atomicstring, then we can make
  -        // it work again.
  -        //CSSParser *p = static_cast<CSSParser *>(parser);
  -        //if (p->styleElement && p->styleElement->isCSSStyleSheet())
  -        //    static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace($$->attr, domString($3));
       }
  -    | '[' maybe_space namespace_selector '|' attrib_id match maybe_space ident_or_string maybe_space ']' {
  +    | '[' maybe_space namespace_selector '|' attr_name match maybe_space ident_or_string maybe_space ']' {
  +        AtomicString namespacePrefix = atomicString($3);
  +        CSSParser *p = static_cast<CSSParser *>(parser);
           $$ = new CSSSelector();
  -        $$->attr = $5;
  +        $$->attr = QualifiedName(namespacePrefix,
  +                                 atomicString($5),
  +                                 static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(namespacePrefix));
           $$->match = (CSSSelector::Match)$6;
           $$->value = atomicString($8);
  -        // FIXME: For now we're breaking namespace support on attributes.  When we switch to atomicstring, then we can make
  -        // it work again.
  -        //CSSParser *p = static_cast<CSSParser *>(parser);
  -        //if (p->styleElement && p->styleElement->isCSSStyleSheet())
  -        //    static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace($$->attr, domString($3));
       }
     ;
   
  
  
  
  1.10      +0 -1      WebCore/khtml/dom/css_stylesheet.cpp
  
  Index: css_stylesheet.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/css_stylesheet.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- css_stylesheet.cpp	9 Jul 2005 20:19:02 -0000	1.9
  +++ css_stylesheet.cpp	18 Jul 2005 21:44:15 -0000	1.10
  @@ -29,7 +29,6 @@
   #include "html/html_headimpl.h"
   
   #include "css/css_stylesheetimpl.h"
  -#include "misc/htmlhashes.h"
   
   #include <stdio.h>
   
  
  
  
  1.8       +0 -1      WebCore/khtml/dom/html_base.cpp
  
  Index: html_base.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_base.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- html_base.cpp	9 Jul 2005 20:19:02 -0000	1.7
  +++ html_base.cpp	18 Jul 2005 21:44:15 -0000	1.8
  @@ -23,7 +23,6 @@
   #include "dom/dom_doc.h"
   #include "dom/html_base.h"
   #include "html/html_baseimpl.h"
  -#include "misc/htmlhashes.h"
   
   using namespace DOM;
   
  
  
  
  1.6       +0 -2      WebCore/khtml/dom/html_block.cpp
  
  Index: html_block.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_block.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- html_block.cpp	9 Jul 2005 20:19:02 -0000	1.5
  +++ html_block.cpp	18 Jul 2005 21:44:15 -0000	1.6
  @@ -27,8 +27,6 @@
   
   using namespace DOM;
   
  -#include "misc/htmlhashes.h"
  -
   HTMLBlockquoteElement::HTMLBlockquoteElement() : HTMLElement()
   {
   }
  
  
  
  1.22      +0 -1      WebCore/khtml/dom/html_document.cpp
  
  Index: html_document.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_document.cpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- html_document.cpp	11 May 2005 00:58:28 -0000	1.21
  +++ html_document.cpp	18 Jul 2005 21:44:15 -0000	1.22
  @@ -28,7 +28,6 @@
   #include "xml/dom_textimpl.h"
   #include "html/html_documentimpl.h"
   #include "html/html_miscimpl.h"
  -#include "misc/htmlhashes.h"
   #include "dom/html_image.h"
   #include "dom/html_form.h"
   #include "html/html_imageimpl.h"
  
  
  
  1.16      +0 -2      WebCore/khtml/dom/html_element.cpp
  
  Index: html_element.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_element.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- html_element.cpp	9 Jul 2005 20:19:02 -0000	1.15
  +++ html_element.cpp	18 Jul 2005 21:44:15 -0000	1.16
  @@ -24,8 +24,6 @@
   #include "css/css_base.h"
   #include "html/html_miscimpl.h" // HTMLCollectionImpl
   
  -#include "misc/htmlhashes.h"
  -
   using namespace DOM;
   
   HTMLElement::HTMLElement() : Element()
  
  
  
  1.13      +0 -1      WebCore/khtml/dom/html_form.cpp
  
  Index: html_form.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_form.cpp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- html_form.cpp	9 Jul 2005 20:19:02 -0000	1.12
  +++ html_form.cpp	18 Jul 2005 21:44:15 -0000	1.13
  @@ -29,7 +29,6 @@
   #include "html/html_miscimpl.h"
   
   #include "xml/dom_docimpl.h"
  -#include "misc/htmlhashes.h"
   
   using namespace DOM;
   
  
  
  
  1.12      +0 -1      WebCore/khtml/dom/html_head.cpp
  
  Index: html_head.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_head.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- html_head.cpp	9 Jul 2005 20:19:02 -0000	1.11
  +++ html_head.cpp	18 Jul 2005 21:44:15 -0000	1.12
  @@ -24,7 +24,6 @@
   #include "dom/html_head.h"
   #include "dom/dom_doc.h"
   #include "html/html_headimpl.h"
  -#include "misc/htmlhashes.h"
   
   using namespace DOM;
   
  
  
  
  1.11      +0 -1      WebCore/khtml/dom/html_image.cpp
  
  Index: html_image.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_image.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- html_image.cpp	9 Jul 2005 20:19:02 -0000	1.10
  +++ html_image.cpp	18 Jul 2005 21:44:15 -0000	1.11
  @@ -28,7 +28,6 @@
   
   #include "html/html_imageimpl.h"
   #include "html/html_miscimpl.h"
  -#include "misc/htmlhashes.h"
   
   using namespace DOM;
   
  
  
  
  1.9       +0 -1      WebCore/khtml/dom/html_inline.cpp
  
  Index: html_inline.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_inline.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- html_inline.cpp	9 Jul 2005 20:19:03 -0000	1.8
  +++ html_inline.cpp	18 Jul 2005 21:44:15 -0000	1.9
  @@ -27,7 +27,6 @@
   #include "html/html_inlineimpl.h"
   #include "html/html_baseimpl.h"
   #include "xml/dom_docimpl.h"
  -#include "misc/htmlhashes.h"
   
   using namespace DOM;
   
  
  
  
  1.6       +0 -1      WebCore/khtml/dom/html_list.cpp
  
  Index: html_list.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_list.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- html_list.cpp	9 Jul 2005 20:19:03 -0000	1.5
  +++ html_list.cpp	18 Jul 2005 21:44:15 -0000	1.6
  @@ -23,7 +23,6 @@
   
   #include "dom/html_list.h"
   #include "html/html_listimpl.h"
  -#include "misc/htmlhashes.h"
   
   using namespace DOM;
   
  
  
  
  1.9       +0 -1      WebCore/khtml/dom/html_misc.cpp
  
  Index: html_misc.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_misc.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- html_misc.cpp	9 Jul 2005 20:19:03 -0000	1.8
  +++ html_misc.cpp	18 Jul 2005 21:44:15 -0000	1.9
  @@ -23,7 +23,6 @@
   
   #include "dom/html_misc.h"
   #include "html/html_miscimpl.h"
  -#include "misc/htmlhashes.h"
   
   using namespace DOM;
   
  
  
  
  1.7       +0 -1      WebCore/khtml/dom/html_object.cpp
  
  Index: html_object.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_object.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- html_object.cpp	9 Jul 2005 20:19:03 -0000	1.6
  +++ html_object.cpp	18 Jul 2005 21:44:15 -0000	1.7
  @@ -23,7 +23,6 @@
   #include "dom/dom_doc.h"
   #include "dom/html_object.h"
   #include "html/html_objectimpl.h"
  -#include "misc/htmlhashes.h"
   
   namespace DOM {
   
  
  
  
  1.8       +0 -1      WebCore/khtml/dom/html_table.cpp
  
  Index: html_table.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/dom/html_table.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- html_table.cpp	9 Jul 2005 20:19:03 -0000	1.7
  +++ html_table.cpp	18 Jul 2005 21:44:15 -0000	1.8
  @@ -27,7 +27,6 @@
   
   #include "html/html_miscimpl.h"
   #include "html/html_tableimpl.h"
  -#include "misc/htmlhashes.h"
   
   using namespace DOM;
   
  
  
  
  1.123     +2 -2      WebCore/khtml/ecma/kjs_html.cpp
  
  Index: kjs_html.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- kjs_html.cpp	9 Jul 2005 20:19:05 -0000	1.122
  +++ kjs_html.cpp	18 Jul 2005 21:44:17 -0000	1.123
  @@ -1607,7 +1607,7 @@
           case InputReadOnly:        return Boolean(input.readOnly());
           case InputSelectionStart:  return getInputSelectionStart(input);
           case InputSelectionEnd:    return getInputSelectionEnd(input);
  -        case InputSize:            return String(input.sizeDOM());
  +        case InputSize:            return Number(input.size());
           case InputSrc:             return String(input.src());
           case InputTabIndex:        return Number(input.tabIndex());
           case InputType:            return String(input.type());
  @@ -2742,7 +2742,7 @@
           case InputMaxLength:       { input.setMaxLength(value.toInt32(exec)); return; }
           case InputName:            { input.setName(str); return; }
           case InputReadOnly:        { input.setReadOnly(value.toBoolean(exec)); return; }
  -        case InputSize:            { input.setSize(str); return; }
  +        case InputSize:            { input.setSize(value.toInt32(exec)); return; }
           case InputSelectionStart:  { input.setSelectionStart(value.toInt32(exec)); return; }
           case InputSelectionEnd:    { input.setSelectionEnd(value.toInt32(exec)); return; }
           case InputSrc:             { input.setSrc(str); return; }
  
  
  
  1.6       +18 -18    WebCore/khtml/editing/apply_style_command.cpp
  
  Index: apply_style_command.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/apply_style_command.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apply_style_command.cpp	9 Jul 2005 20:19:06 -0000	1.5
  +++ apply_style_command.cpp	18 Jul 2005 21:44:17 -0000	1.6
  @@ -34,7 +34,6 @@
   #include "dom/dom_string.h"
   #include "html/html_elementimpl.h"
   #include "htmlnames.h"
  -#include "misc/htmlattrs.h"
   #include "rendering/render_object.h"
   #include "xml/dom_docimpl.h"
   #include "xml/dom_textimpl.h"
  @@ -66,6 +65,7 @@
   using DOM::RangeImpl;
   using DOM::TextImpl;
   using DOM::HTMLNames;
  +using DOM::HTMLAttributes;
   
   namespace khtml {
   
  @@ -250,7 +250,7 @@
           return false;
   
       const HTMLElementImpl *elem = static_cast<const HTMLElementImpl *>(node);
  -    return elem->hasLocalName(HTMLNames::span()) && elem->getAttribute(ATTR_CLASS) == styleSpanClassString();
  +    return elem->hasLocalName(HTMLAttributes::span()) && elem->getAttribute(HTMLAttributes::classAttr()) == styleSpanClassString();
   }
   
   static bool isEmptyStyleSpan(const NodeImpl *node)
  @@ -260,7 +260,7 @@
   
       const HTMLElementImpl *elem = static_cast<const HTMLElementImpl *>(node);
       CSSMutableStyleDeclarationImpl *inlineStyleDecl = elem->inlineStyleDecl();
  -    return (!inlineStyleDecl || inlineStyleDecl->length() == 0) && elem->getAttribute(ATTR_CLASS) == styleSpanClassString();
  +    return (!inlineStyleDecl || inlineStyleDecl->length() == 0) && elem->getAttribute(HTMLAttributes::classAttr()) == styleSpanClassString();
   }
   
   static bool isEmptyFontTag(const NodeImpl *node)
  @@ -270,7 +270,7 @@
   
       const ElementImpl *elem = static_cast<const ElementImpl *>(node);
       NamedAttrMapImpl *map = elem->attributes(true); // true for read-only
  -    return (!map || map->length() == 1) && elem->getAttribute(ATTR_CLASS) == styleSpanClassString();
  +    return (!map || map->length() == 1) && elem->getAttribute(HTMLAttributes::classAttr()) == styleSpanClassString();
   }
   
   static ElementImpl *createFontElement(DocumentImpl *document)
  @@ -278,7 +278,7 @@
       int exceptionCode = 0;
       ElementImpl *fontNode = document->createElementNS(HTMLNames::xhtmlNamespaceURI(), "font", exceptionCode);
       ASSERT(exceptionCode == 0);
  -    fontNode->setAttribute(ATTR_CLASS, styleSpanClassString());
  +    fontNode->setAttribute(HTMLAttributes::classAttr(), styleSpanClassString());
       return fontNode;
   }
   
  @@ -287,7 +287,7 @@
       int exceptionCode = 0;
       ElementImpl *styleElement = document->createElementNS(HTMLNames::xhtmlNamespaceURI(), "span", exceptionCode);
       ASSERT(exceptionCode == 0);
  -    styleElement->setAttribute(ATTR_CLASS, styleSpanClassString());
  +    styleElement->setAttribute(HTMLAttributes::classAttr(), styleSpanClassString());
       return styleElement;
   }
   
  @@ -497,10 +497,10 @@
               QString desiredFontSizeString = QString::number(desiredFontSize);
               desiredFontSizeString += "px";
               inlineStyleDecl->setProperty(CSS_PROP_FONT_SIZE, desiredFontSizeString, false, false);
  -            setNodeAttribute(elem, ATTR_STYLE, inlineStyleDecl->cssText());
  +            setNodeAttribute(elem, HTMLAttributes::style(), inlineStyleDecl->cssText());
           }
           if (inlineStyleDecl->length() == 0) {
  -            removeNodeAttribute(elem, ATTR_STYLE);
  +            removeNodeAttribute(elem, HTMLAttributes::style());
               if (isEmptyStyleSpan(elem))
                   emptySpans.append(elem);
           }
  @@ -647,15 +647,15 @@
       for (QValueListConstIterator<CSSProperty> it = style->valuesIterator(); it != end; ++it) {
           switch ((*it).id()) {
               case CSS_PROP_COLOR:
  -                elem->removeAttribute(ATTR_COLOR, exceptionCode);
  +                elem->removeAttribute(HTMLAttributes::color(), exceptionCode);
                   ASSERT(exceptionCode == 0);
                   break;
               case CSS_PROP_FONT_FAMILY:
  -                elem->removeAttribute(ATTR_FACE, exceptionCode);
  +                elem->removeAttribute(HTMLAttributes::face(), exceptionCode);
                   ASSERT(exceptionCode == 0);
                   break;
               case CSS_PROP_FONT_SIZE:
  -                elem->removeAttribute(ATTR_SIZE, exceptionCode);
  +                elem->removeAttribute(HTMLAttributes::size(), exceptionCode);
                   ASSERT(exceptionCode == 0);
                   break;
           }
  @@ -822,7 +822,7 @@
           CSSMutableStyleDeclarationImpl *decl = element->inlineStyleDecl();
           if (decl)
               cssText += decl->cssText();
  -        setNodeAttribute(element, ATTR_STYLE, cssText);
  +        setNodeAttribute(element, HTMLAttributes::style(), cssText);
       }
   }
   
  @@ -1061,7 +1061,7 @@
   
       for (unsigned i = 0; i < firstLength; i++) {
           DOM::AttributeImpl *attribute = firstMap->attributeItem(i);
  -        DOM::AttributeImpl *secondAttribute = secondMap->getAttributeItem(attribute->id());
  +        DOM::AttributeImpl *secondAttribute = secondMap->getAttributeItem(attribute->name());
   
           if (!secondAttribute || attribute->value() != secondAttribute->value())
               return false;
  @@ -1240,7 +1240,7 @@
           CSSMutableStyleDeclarationImpl *decl = block->inlineStyleDecl();
           if (decl)
               cssText += decl->cssText();
  -        setNodeAttribute(block, ATTR_STYLE, cssText);
  +        setNodeAttribute(block, HTMLAttributes::style(), cssText);
       }
   }
   
  @@ -1257,18 +1257,18 @@
           ASSERT(exceptionCode == 0);
           insertNodeBefore(fontElement, startNode);
           if (styleChange.applyFontColor())
  -            fontElement->setAttribute(ATTR_COLOR, styleChange.fontColor());
  +            fontElement->setAttribute(HTMLAttributes::color(), styleChange.fontColor());
           if (styleChange.applyFontFace())
  -            fontElement->setAttribute(ATTR_FACE, styleChange.fontFace());
  +            fontElement->setAttribute(HTMLAttributes::face(), styleChange.fontFace());
           if (styleChange.applyFontSize())
  -            fontElement->setAttribute(ATTR_SIZE, styleChange.fontSize());
  +            fontElement->setAttribute(HTMLAttributes::size(), styleChange.fontSize());
           surroundNodeRangeWithElement(startNode, endNode, fontElement);
       }
   
       if (styleChange.cssStyle().length() > 0) {
           ElementImpl *styleElement = createStyleSpanElement(document());
           styleElement->ref();
  -        styleElement->setAttribute(ATTR_STYLE, styleChange.cssStyle());
  +        styleElement->setAttribute(HTMLAttributes::style(), styleChange.cssStyle());
           insertNodeBefore(styleElement, startNode);
           styleElement->deref();
           surroundNodeRangeWithElement(startNode, endNode, styleElement);
  
  
  
  1.5       +6 -5      WebCore/khtml/editing/composite_edit_command.cpp
  
  Index: composite_edit_command.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/composite_edit_command.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- composite_edit_command.cpp	9 Jul 2005 20:19:07 -0000	1.4
  +++ composite_edit_command.cpp	18 Jul 2005 21:44:17 -0000	1.5
  @@ -46,7 +46,6 @@
   #include "visible_units.h"
   #include "wrap_contents_in_dummy_span_command.h"
   
  -#include "misc/htmlattrs.h"
   #include "htmlnames.h"
   #include "rendering/render_text.h"
   #include "xml/dom2_rangeimpl.h"
  @@ -67,7 +66,9 @@
   using DOM::Position;
   using DOM::RangeImpl;
   using DOM::TextImpl;
  +using DOM::HTMLAttributes;
   using DOM::HTMLNames;
  +using DOM::QualifiedName;
   
   namespace khtml {
   
  @@ -300,7 +301,7 @@
       applyCommandToComposite(cmd);
   }
   
  -void CompositeEditCommand::removeNodeAttribute(ElementImpl *element, int attribute)
  +void CompositeEditCommand::removeNodeAttribute(ElementImpl *element, const QualifiedName& attribute)
   {
       DOMString value = element->getAttribute(attribute);
       if (value.isEmpty())
  @@ -309,7 +310,7 @@
       applyCommandToComposite(cmd);
   }
   
  -void CompositeEditCommand::setNodeAttribute(ElementImpl *element, int attribute, const DOMString &value)
  +void CompositeEditCommand::setNodeAttribute(ElementImpl *element, const QualifiedName& attribute, const DOMString &value)
   {
       EditCommandPtr cmd(new SetNodeAttributeCommand(document(), element, attribute, value));
       applyCommandToComposite(cmd);
  @@ -495,7 +496,7 @@
           if (checkMe->isElementNode()) {
               ElementImpl *element = static_cast<ElementImpl *>(checkMe);
               if (element->enclosingBlockFlowElement() == node && 
  -                element->getAttribute(ATTR_CLASS) == blockPlaceholderClassString()) {
  +                element->getAttribute(HTMLAttributes::classAttr()) == blockPlaceholderClassString()) {
                   return element;
               }
           }
  @@ -581,7 +582,7 @@
       int exceptionCode = 0;
       ElementImpl *breakNode = document->createElementNS(HTMLNames::xhtmlNamespaceURI(), "br", exceptionCode);
       ASSERT(exceptionCode == 0);
  -    breakNode->setAttribute(ATTR_CLASS, blockPlaceholderClassString());
  +    breakNode->setAttribute(HTMLAttributes::classAttr(), blockPlaceholderClassString());
       return breakNode;
   }
   
  
  
  
  1.2       +3 -2      WebCore/khtml/editing/composite_edit_command.h
  
  Index: composite_edit_command.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/composite_edit_command.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- composite_edit_command.h	12 May 2005 04:00:19 -0000	1.1
  +++ composite_edit_command.h	18 Jul 2005 21:44:17 -0000	1.2
  @@ -33,6 +33,7 @@
       class CSSStyleDeclarationImpl;
       class DOMString;
       class TextImpl;
  +    class QualifiedName;
   }
   
   namespace khtml {
  @@ -66,12 +67,12 @@
       void rebalanceWhitespace();
       void removeCSSProperty(DOM::CSSStyleDeclarationImpl *, int property);
       void removeFullySelectedNode(DOM::NodeImpl *node);
  -    void removeNodeAttribute(DOM::ElementImpl *, int attribute);
  +    void removeNodeAttribute(DOM::ElementImpl *, const DOM::QualifiedName& attribute);
       void removeChildrenInRange(DOM::NodeImpl *node, int from, int to);
       void removeNode(DOM::NodeImpl *removeChild);
       void removeNodePreservingChildren(DOM::NodeImpl *node);
       void replaceTextInNode(DOM::TextImpl *node, long offset, long count, const DOM::DOMString &replacementText);
  -    void setNodeAttribute(DOM::ElementImpl *, int attribute, const DOM::DOMString &);
  +    void setNodeAttribute(DOM::ElementImpl *, const DOM::QualifiedName& attribute, const DOM::DOMString &);
       void splitTextNode(DOM::TextImpl *text, long offset);
       void splitElement(DOM::ElementImpl *element, DOM::NodeImpl *atChild);
       void mergeIdenticalElements(DOM::ElementImpl *first, DOM::ElementImpl *second);
  
  
  
  1.7       +2 -0      WebCore/khtml/editing/delete_selection_command.cpp
  
  Index: delete_selection_command.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/delete_selection_command.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- delete_selection_command.cpp	18 Jul 2005 18:15:00 -0000	1.6
  +++ delete_selection_command.cpp	18 Jul 2005 21:44:18 -0000	1.7
  @@ -628,6 +628,8 @@
       // has completed.
       // FIXME: Improve typing style.
       // See this bug: <rdar://problem/3769899> Implementation of typing style needs improvement
  +    if (!m_typingStyle)
  +        return;
       CSSComputedStyleDeclarationImpl endingStyle(m_endingPosition.node());
       endingStyle.diff(m_typingStyle);
       if (!m_typingStyle->length()) {
  
  
  
  1.251     +0 -1      WebCore/khtml/editing/htmlediting.cpp
  
  Index: htmlediting.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/htmlediting.cpp,v
  retrieving revision 1.250
  retrieving revision 1.251
  diff -u -r1.250 -r1.251
  --- htmlediting.cpp	9 Jul 2005 20:19:07 -0000	1.250
  +++ htmlediting.cpp	18 Jul 2005 21:44:18 -0000	1.251
  @@ -41,7 +41,6 @@
   #include "html_elementimpl.h"
   #include "html_imageimpl.h"
   #include "html_interchange.h"
  -#include "htmlattrs.h"
   #include "htmlnames.h"
   #include "khtml_part.h"
   #include "khtml_part.h"
  
  
  
  1.25      +8 -8      WebCore/khtml/editing/markup.cpp
  
  Index: markup.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/markup.cpp,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- markup.cpp	9 Jul 2005 20:19:07 -0000	1.24
  +++ markup.cpp	18 Jul 2005 21:44:18 -0000	1.25
  @@ -35,7 +35,6 @@
   #include "xml/dom_position.h"
   #include "xml/dom2_rangeimpl.h"
   #include "rendering/render_text.h"
  -#include "misc/htmlattrs.h"
   #include "htmlnames.h"
   
   using DOM::AttributeImpl;
  @@ -47,6 +46,7 @@
   using DOM::DOMString;
   using DOM::ElementImpl;
   using DOM::TagStatusForbidden;
  +using DOM::HTMLAttributes;
   using DOM::HTMLElementImpl;
   using DOM::HTMLNames;
   using DOM::NamedAttrMapImpl;
  @@ -224,16 +224,17 @@
                   unsigned long length = attrs->length();
                   if (length == 0 && additionalStyle.length() > 0) {
                       // FIXME: Handle case where additionalStyle has illegal characters in it, like "
  -                    markup += " " + node->getDocument()->attrName(ATTR_STYLE).string() + "=\"" + additionalStyle.string() + "\"";
  +                    markup += " " +  HTMLAttributes::style().localName().string() + "=\"" + additionalStyle.string() + "\"";
                   }
                   else {
                       for (unsigned int i=0; i<length; i++) {
                           AttributeImpl *attr = attrs->attributeItem(i);
                           DOMString value = attr->value();
  -                        if (attr->id() == ATTR_STYLE && additionalStyle.length() > 0)
  +                        if (attr->name() == HTMLAttributes::style() && additionalStyle.length() > 0)
                               value += "; " + additionalStyle;
                           // FIXME: Handle case where value has illegal characters in it, like "
  -                        markup += " " + node->getDocument()->attrName(attr->id()).string() + "=\"" + value.string() + "\"";
  +                        // FIXME: Namespaces! XML! Ack!
  +                        markup += " " + attr->name().localName().string() + "=\"" + value.string() + "\"";
                       }
                   }
               }
  @@ -297,9 +298,8 @@
               unsigned long length = attrs->length();
               for (unsigned long i = 0; i < length; i++) {
                   AttributeImpl *attr = attrs->attributeItem(i);
  -                if (e->isURLAttribute(attr)) {
  -                    e->setAttribute(attr->id(), KURL(baseURL, attr->value().string()).url());
  -                }
  +                if (e->isURLAttribute(attr))
  +                    e->setAttribute(attr->name(), KURL(baseURL, attr->value().string()).url());
               }
           }
       }
  @@ -549,7 +549,7 @@
                   element = document->createElementNS(HTMLNames::xhtmlNamespaceURI(), "br", exceptionCode);
                   ASSERT(exceptionCode == 0);
                   element->ref();
  -                element->setAttribute(ATTR_CLASS, AppleInterchangeNewline);            
  +                element->setAttribute(HTMLAttributes::classAttr(), AppleInterchangeNewline);            
               } else {
                   element = createDefaultParagraphElement(document);
                   NodeImpl *paragraphContents;
  
  
  
  1.2       +2 -1      WebCore/khtml/editing/remove_node_attribute_command.cpp
  
  Index: remove_node_attribute_command.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/remove_node_attribute_command.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- remove_node_attribute_command.cpp	24 May 2005 07:21:47 -0000	1.1
  +++ remove_node_attribute_command.cpp	18 Jul 2005 21:44:18 -0000	1.2
  @@ -36,10 +36,11 @@
   using DOM::DocumentImpl;
   using DOM::ElementImpl;
   using DOM::NodeImpl;
  +using DOM::QualifiedName;
   
   namespace khtml {
   
  -RemoveNodeAttributeCommand::RemoveNodeAttributeCommand(DocumentImpl *document, ElementImpl *element, NodeImpl::Id attribute)
  +RemoveNodeAttributeCommand::RemoveNodeAttributeCommand(DocumentImpl *document, ElementImpl *element, const QualifiedName& attribute)
       : EditCommand(document), m_element(element), m_attribute(attribute)
   {
       ASSERT(m_element);
  
  
  
  1.2       +5 -4      WebCore/khtml/editing/remove_node_attribute_command.h
  
  Index: remove_node_attribute_command.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/remove_node_attribute_command.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- remove_node_attribute_command.h	24 May 2005 07:21:47 -0000	1.1
  +++ remove_node_attribute_command.h	18 Jul 2005 21:44:18 -0000	1.2
  @@ -29,24 +29,25 @@
   #include "edit_command.h"
   
   #include "xml/dom_nodeimpl.h"
  -   
  +#include "dom_qname.h"
  +
   namespace khtml {
   
   class RemoveNodeAttributeCommand : public EditCommand
   {
   public:
  -    RemoveNodeAttributeCommand(DOM::DocumentImpl *, DOM::ElementImpl *, DOM::NodeImpl::Id attribute);
  +    RemoveNodeAttributeCommand(DOM::DocumentImpl *, DOM::ElementImpl *, const DOM::QualifiedName& attribute);
       virtual ~RemoveNodeAttributeCommand();
   
       virtual void doApply();
       virtual void doUnapply();
   
       DOM::ElementImpl *element() const { return m_element; }
  -    DOM::NodeImpl::Id attribute() const { return m_attribute; }
  +    const DOM::QualifiedName& attribute() const { return m_attribute; }
       
   private:
       DOM::ElementImpl *m_element;
  -    DOM::NodeImpl::Id m_attribute;
  +    DOM::QualifiedName m_attribute;
       DOM::DOMString m_oldValue;
   };
   
  
  
  
  1.6       +5 -3      WebCore/khtml/editing/replace_selection_command.cpp
  
  Index: replace_selection_command.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/replace_selection_command.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- replace_selection_command.cpp	9 Jul 2005 20:19:07 -0000	1.5
  +++ replace_selection_command.cpp	18 Jul 2005 21:44:18 -0000	1.6
  @@ -26,7 +26,6 @@
   #include "replace_selection_command.h"
   
   #include "visible_position.h"
  -#include "misc/htmlattrs.h"
   #include "htmlnames.h"
   #include "xml/dom_docimpl.h"
   #include "html_interchange.h"
  @@ -55,6 +54,7 @@
   using DOM::ElementImpl;
   using DOM::TextImpl;
   using DOM::DOMString;
  +using DOM::HTMLAttributes;
   using DOM::HTMLElementImpl;
   using DOM::CSSMutableStyleDeclarationImpl;
   using DOM::Position;
  @@ -227,13 +227,15 @@
   bool ReplacementFragment::isInterchangeNewlineNode(const NodeImpl *node)
   {
       static DOMString interchangeNewlineClassString(AppleInterchangeNewline);
  -    return node && node->hasTagName(HTMLNames::br()) && static_cast<const ElementImpl *>(node)->getAttribute(ATTR_CLASS) == interchangeNewlineClassString;
  +    return node && node->hasTagName(HTMLNames::br()) && 
  +           static_cast<const ElementImpl *>(node)->getAttribute(HTMLAttributes::classAttr()) == interchangeNewlineClassString;
   }
   
   bool ReplacementFragment::isInterchangeConvertedSpaceSpan(const NodeImpl *node)
   {
       static DOMString convertedSpaceSpanClassString(AppleConvertedSpace);
  -    return node->isHTMLElement() && static_cast<const HTMLElementImpl *>(node)->getAttribute(ATTR_CLASS) == convertedSpaceSpanClassString;
  +    return node->isHTMLElement() && 
  +           static_cast<const HTMLElementImpl *>(node)->getAttribute(HTMLAttributes::classAttr()) == convertedSpaceSpanClassString;
   }
   
   NodeImpl *ReplacementFragment::enclosingBlock(NodeImpl *node) const
  
  
  
  1.2       +3 -1      WebCore/khtml/editing/set_node_attribute_command.cpp
  
  Index: set_node_attribute_command.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/set_node_attribute_command.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- set_node_attribute_command.cpp	24 May 2005 07:21:47 -0000	1.1
  +++ set_node_attribute_command.cpp	18 Jul 2005 21:44:18 -0000	1.2
  @@ -37,10 +37,12 @@
   using DOM::ElementImpl;
   using DOM::NodeImpl;
   using DOM::DOMString;
  +using DOM::QualifiedName;
   
   namespace khtml {
   
  -SetNodeAttributeCommand::SetNodeAttributeCommand(DocumentImpl *document, ElementImpl *element, NodeImpl::Id attribute, const DOMString &value)
  +SetNodeAttributeCommand::SetNodeAttributeCommand(DocumentImpl *document, ElementImpl *element, 
  +                                                 const QualifiedName& attribute, const DOMString &value)
       : EditCommand(document), m_element(element), m_attribute(attribute), m_value(value)
   {
       ASSERT(m_element);
  
  
  
  1.2       +4 -3      WebCore/khtml/editing/set_node_attribute_command.h
  
  Index: set_node_attribute_command.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/set_node_attribute_command.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- set_node_attribute_command.h	24 May 2005 07:21:47 -0000	1.1
  +++ set_node_attribute_command.h	18 Jul 2005 21:44:18 -0000	1.2
  @@ -29,25 +29,26 @@
   #include "edit_command.h"
   
   #include "xml/dom_nodeimpl.h"
  +#include "dom_qname.h"
   
   namespace khtml {
   
   class SetNodeAttributeCommand : public EditCommand
   {
   public:
  -    SetNodeAttributeCommand(DOM::DocumentImpl *, DOM::ElementImpl *, DOM::NodeImpl::Id attribute, const DOM::DOMString &value);
  +    SetNodeAttributeCommand(DOM::DocumentImpl *, DOM::ElementImpl *, const DOM::QualifiedName& attribute, const DOM::DOMString &value);
       virtual ~SetNodeAttributeCommand();
   
       virtual void doApply();
       virtual void doUnapply();
   
       DOM::ElementImpl *element() const { return m_element; }
  -    DOM::NodeImpl::Id attribute() const { return m_attribute; }
  +    const DOM::QualifiedName& attribute() const { return m_attribute; }
       DOM::DOMString value() const { return m_value; }
       
   private:
       DOM::ElementImpl *m_element;
  -    DOM::NodeImpl::Id m_attribute;
  +    DOM::QualifiedName m_attribute;
       DOM::DOMString m_value;
       DOM::DOMString m_oldValue;
   };
  
  
  
  1.75      +156 -209  WebCore/khtml/html/html_baseimpl.cpp
  
  Index: html_baseimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_baseimpl.cpp,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- html_baseimpl.cpp	12 Jul 2005 02:00:18 -0000	1.74
  +++ html_baseimpl.cpp	18 Jul 2005 21:44:19 -0000	1.75
  @@ -37,7 +37,6 @@
   #include "css/cssvalues.h"
   #include "css/csshelper.h"
   #include "misc/loader.h"
  -#include "misc/htmlhashes.h"
   #include "dom/dom_string.h"
   #include "xml/dom2_eventsimpl.h"
   
  @@ -70,70 +69,57 @@
       m_linkDecl->setStrictParsing(!getDocument()->inCompatMode());
   }
   
  -bool HTMLBodyElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLBodyElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch(attr)
  -    {
  -        case ATTR_BACKGROUND:
  -            result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  -            return false;
  -        case ATTR_BGCOLOR:
  -        case ATTR_TEXT:
  -        case ATTR_MARGINWIDTH:
  -        case ATTR_LEFTMARGIN:
  -        case ATTR_MARGINHEIGHT:
  -        case ATTR_TOPMARGIN:
  -        case ATTR_BGPROPERTIES:
  -            result = eUniversal;
  -            return false;
  -        default:
  -            break;
  -    }
  +    if (attrName == HTMLAttributes::background()) {
  +        result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  +        return false;
  +    } 
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    if (attrName == HTMLAttributes::bgcolor() ||
  +        attrName == HTMLAttributes::text() ||
  +        attrName == HTMLAttributes::marginwidth() ||
  +        attrName == HTMLAttributes::leftmargin() ||
  +        attrName == HTMLAttributes::marginheight() ||
  +        attrName == HTMLAttributes::topmargin() ||
  +        attrName == HTMLAttributes::bgproperties()) {
  +        result = eUniversal;
  +        return false;
  +    }
  +
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLBodyElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_BACKGROUND:
  -    {
  -        QString url = khtml::parseURL( attr->value() ).string();
  +    if (attr->name() == HTMLAttributes::background()) {
  +        QString url = khtml::parseURL(attr->value()).string();
           if (!url.isEmpty())
               addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
  -        break;
  -    }
  -    case ATTR_MARGINWIDTH:
  -        addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value() );
  -        /* nobreak; */
  -    case ATTR_LEFTMARGIN:
  -        addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value() );
  -        break;
  -    case ATTR_MARGINHEIGHT:
  +    } else if (attr->name() == HTMLAttributes::marginwidth()) {
  +        addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  +        addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
  +    } else if (attr->name() == HTMLAttributes::leftmargin()) {
  +        addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
  +    } else if (attr->name() == HTMLAttributes::marginheight()) {
           addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  -        /* nobreak */
  -    case ATTR_TOPMARGIN:
           addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
  -        break;
  -    case ATTR_BGCOLOR:
  +    } else if (attr->name() == HTMLAttributes::topmargin()) {
  +        addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
  +    } else if (attr->name() == HTMLAttributes::bgcolor()) {
           addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
  -        break;
  -    case ATTR_TEXT:
  +    } else if (attr->name() == HTMLAttributes::text()) {
           addCSSColor(attr, CSS_PROP_COLOR, attr->value());
  -        break;
  -    case ATTR_BGPROPERTIES:
  -        if ( strcasecmp( attr->value(), "fixed" ) == 0)
  +    } else if (attr->name() == HTMLAttributes::bgproperties()) {
  +        if (strcasecmp( attr->value(), "fixed" ) == 0)
               addCSSProperty(attr, CSS_PROP_BACKGROUND_ATTACHMENT, CSS_VAL_FIXED);
  -        break;
  -    case ATTR_VLINK:
  -    case ATTR_ALINK:
  -    case ATTR_LINK:
  -    {
  +    } else if (attr->name() == HTMLAttributes::vlink() ||
  +               attr->name() == HTMLAttributes::alink() ||
  +               attr->name() == HTMLAttributes::link()) {
           if (attr->isNull()) {
  -            if (attr->id() == ATTR_LINK)
  +            if (attr->name() == HTMLAttributes::link())
                   getDocument()->resetLinkColor();
  -            else if (attr->id() == ATTR_VLINK)
  +            else if (attr->name() == HTMLAttributes::vlink())
                   getDocument()->resetVisitedLinkColor();
               else
                   getDocument()->resetActiveLinkColor();
  @@ -147,9 +133,9 @@
                   val->ref();
                   if (val->isPrimitiveValue()) {
                       QColor col = getDocument()->styleSelector()->getColorFromPrimitiveValue(static_cast<CSSPrimitiveValueImpl*>(val));
  -                    if (attr->id() == ATTR_LINK)
  +                    if (attr->name() == HTMLAttributes::link())
                           getDocument()->setLinkColor(col);
  -                    else if (attr->id() == ATTR_VLINK)
  +                    else if (attr->name() == HTMLAttributes::vlink())
                           getDocument()->setVisitedLinkColor(col);
                       else
                           getDocument()->setActiveLinkColor(col);
  @@ -160,37 +146,26 @@
           
           if (attached())
               getDocument()->recalcStyle(Force);
  -        break;
  -    }
  -    case ATTR_ONLOAD:
  -        getDocument()->setHTMLWindowEventListener(EventImpl::LOAD_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  -        break;
  -    case ATTR_ONUNLOAD:
  +    } else if (attr->name() == HTMLAttributes::onload()) {
  +        getDocument()->setHTMLWindowEventListener(EventImpl::LOAD_EVENT,	    
  +                                                  getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  +    } else if (attr->name() == HTMLAttributes::onunload()) {
           getDocument()->setHTMLWindowEventListener(EventImpl::UNLOAD_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  -        break;
  -    case ATTR_ONBLUR:
  +                                                  getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  +    } else if (attr->name() == HTMLAttributes::onblur()) {
           getDocument()->setHTMLWindowEventListener(EventImpl::BLUR_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  -        break;
  -    case ATTR_ONFOCUS:
  +                                                  getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  +    } else if (attr->name() == HTMLAttributes::onfocus()) {
           getDocument()->setHTMLWindowEventListener(EventImpl::FOCUS_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  -        break;
  -    case ATTR_ONRESIZE:
  +                                                  getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  +    } else if (attr->name() == HTMLAttributes::onresize()) {
           getDocument()->setHTMLWindowEventListener(EventImpl::RESIZE_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  -        break;
  -    case ATTR_ONSCROLL:
  +                                                  getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  +    } else if (attr->name() == HTMLAttributes::onscroll()) {
           getDocument()->setHTMLWindowEventListener(EventImpl::SCROLL_EVENT,
                                                     getDocument()->createHTMLEventListener(attr->value().string(), NULL));
  -        break;
  -    case ATTR_NOSAVE:
  -	break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLBodyElementImpl::insertedIntoDocument()
  @@ -203,13 +178,13 @@
       KHTMLView *w = d ? d->view() : 0;
       if (w && w->marginWidth() != -1) {
           QString s;
  -        s.sprintf( "%d", w->marginWidth() );
  -        setAttribute(ATTR_MARGINWIDTH, s);
  +        s.sprintf("%d", w->marginWidth());
  +        setAttribute(HTMLAttributes::marginwidth(), s);
       }
       if (w && w->marginHeight() != -1) {
           QString s;
  -        s.sprintf( "%d", w->marginHeight() );
  -        setAttribute(ATTR_MARGINHEIGHT, s);
  +        s.sprintf("%d", w->marginHeight());
  +        setAttribute(HTMLAttributes::marginheight(), s);
       }
   
       if (w)
  @@ -218,67 +193,67 @@
   
   bool HTMLBodyElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_BACKGROUND;
  +    return attr->name() == HTMLAttributes::background();
   }
   
   DOMString HTMLBodyElementImpl::aLink() const
   {
  -    return getAttribute(ATTR_ALINK);
  +    return getAttribute(HTMLAttributes::alink());
   }
   
   void HTMLBodyElementImpl::setALink(const DOMString &value)
   {
  -    setAttribute(ATTR_ALINK, value);
  +    setAttribute(HTMLAttributes::alink(), value);
   }
   
   DOMString HTMLBodyElementImpl::background() const
   {
  -    return getAttribute(ATTR_BACKGROUND);
  +    return getAttribute(HTMLAttributes::background());
   }
   
   void HTMLBodyElementImpl::setBackground(const DOMString &value)
   {
  -    setAttribute(ATTR_BACKGROUND, value);
  +    setAttribute(HTMLAttributes::background(), value);
   }
   
   DOMString HTMLBodyElementImpl::bgColor() const
   {
  -    return getAttribute(ATTR_BGCOLOR);
  +    return getAttribute(HTMLAttributes::bgcolor());
   }
   
   void HTMLBodyElementImpl::setBgColor(const DOMString &value)
   {
  -    setAttribute(ATTR_BGCOLOR, value);
  +    setAttribute(HTMLAttributes::bgcolor(), value);
   }
   
   DOMString HTMLBodyElementImpl::link() const
   {
  -    return getAttribute(ATTR_LINK);
  +    return getAttribute(HTMLAttributes::link());
   }
   
   void HTMLBodyElementImpl::setLink(const DOMString &value)
   {
  -    setAttribute(ATTR_LINK, value);
  +    setAttribute(HTMLAttributes::link(), value);
   }
   
   DOMString HTMLBodyElementImpl::text() const
   {
  -    return getAttribute(ATTR_TEXT);
  +    return getAttribute(HTMLAttributes::text());
   }
   
   void HTMLBodyElementImpl::setText(const DOMString &value)
   {
  -    setAttribute(ATTR_TEXT, value);
  +    setAttribute(HTMLAttributes::text(), value);
   }
   
   DOMString HTMLBodyElementImpl::vLink() const
   {
  -    return getAttribute(ATTR_VLINK);
  +    return getAttribute(HTMLAttributes::vlink());
   }
   
   void HTMLBodyElementImpl::setVLink(const DOMString &value)
   {
  -    setAttribute(ATTR_VLINK, value);
  +    setAttribute(HTMLAttributes::vlink(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -406,39 +381,31 @@
   
   void HTMLFrameElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_SRC:
  +    if (attr->name() == HTMLAttributes::src()) {
           setLocation(khtml::parseURL(attr->value()));
  -        break;
  -    case ATTR_ID:
  -        // Important to call through to base for ATTR_ID so the hasID bit gets set.
  +    } else if (attr->name() == HTMLAttributes::idAttr()) {
  +        // Important to call through to base for the id attribute so the hasID bit gets set.
           HTMLElementImpl::parseMappedAttribute(attr);
  -        // fall through
  -    case ATTR_NAME:
  +        m_name = attr->value();
  +    } else if (attr->name() == HTMLAttributes::name()) {
           m_name = attr->value();
           // FIXME: If we are already attached, this doesn't actually change the frame's name.
           // FIXME: If we are already attached, this doesn't check for frame name
           // conflicts and generate a unique frame name.
  -        break;
  -    case ATTR_FRAMEBORDER:
  +    } else if (attr->name() == HTMLAttributes::frameborder()) {
           m_frameBorder = attr->value().toInt();
           m_frameBorderSet = !attr->isNull();
           // FIXME: If we are already attached, this has no effect.
  -        break;
  -    case ATTR_MARGINWIDTH:
  +    } else if (attr->name() == HTMLAttributes::marginwidth()) {
           m_marginWidth = attr->value().toInt();
           // FIXME: If we are already attached, this has no effect.
  -        break;
  -    case ATTR_MARGINHEIGHT:
  +    } else if (attr->name() == HTMLAttributes::marginheight()) {
           m_marginHeight = attr->value().toInt();
           // FIXME: If we are already attached, this has no effect.
  -        break;
  -    case ATTR_NORESIZE:
  +    } else if (attr->name() == HTMLAttributes::noresize()) {
           m_noResize = true;
           // FIXME: If we are already attached, this has no effect.
  -        break;
  -    case ATTR_SCROLLING:
  +    } else if (attr->name() == HTMLAttributes::scrolling()) {
           kdDebug( 6031 ) << "set scroll mode" << endl;
   	// Auto and yes both simply mean "allow scrolling."  No means
   	// "don't allow scrolling."
  @@ -448,18 +415,14 @@
           else if( strcasecmp( attr->value(), "no" ) == 0 )
               m_scrolling = QScrollView::AlwaysOff;
           // FIXME: If we are already attached, this has no effect.
  -        break;
  -    case ATTR_ONLOAD:
  +    } else if (attr->name() == HTMLAttributes::onload()) {
           setHTMLEventListener(EventImpl::LOAD_EVENT,
                                   getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONUNLOAD:
  +    } else if (attr->name() == HTMLAttributes::onunload()) {
           setHTMLEventListener(EventImpl::UNLOAD_EVENT,
                                   getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   bool HTMLFrameElementImpl::rendererIsNeeded(RenderStyle *style)
  @@ -475,9 +438,9 @@
   
   void HTMLFrameElementImpl::attach()
   {
  -    m_name = getAttribute(ATTR_NAME);
  +    m_name = getAttribute(HTMLAttributes::name());
       if (m_name.isNull())
  -        m_name = getAttribute(ATTR_ID);
  +        m_name = getAttribute(HTMLAttributes::idAttr());
   
       // inherit default settings from parent frameset
       for (NodeImpl *node = parentNode(); node; node = node->parentNode())
  @@ -579,82 +542,82 @@
   
   bool HTMLFrameElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_SRC;
  +    return attr->name() == HTMLAttributes::src();
   }
   
   DOMString HTMLFrameElementImpl::frameBorder() const
   {
  -    return getAttribute(ATTR_FRAMEBORDER);
  +    return getAttribute(HTMLAttributes::frameborder());
   }
   
   void HTMLFrameElementImpl::setFrameBorder(const DOMString &value)
   {
  -    setAttribute(ATTR_FRAMEBORDER, value);
  +    setAttribute(HTMLAttributes::frameborder(), value);
   }
   
   DOMString HTMLFrameElementImpl::longDesc() const
   {
  -    return getAttribute(ATTR_LONGDESC);
  +    return getAttribute(HTMLAttributes::longdesc());
   }
   
   void HTMLFrameElementImpl::setLongDesc(const DOMString &value)
   {
  -    setAttribute(ATTR_LONGDESC, value);
  +    setAttribute(HTMLAttributes::longdesc(), value);
   }
   
   DOMString HTMLFrameElementImpl::marginHeight() const
   {
  -    return getAttribute(ATTR_MARGINHEIGHT);
  +    return getAttribute(HTMLAttributes::marginheight());
   }
   
   void HTMLFrameElementImpl::setMarginHeight(const DOMString &value)
   {
  -    setAttribute(ATTR_MARGINHEIGHT, value);
  +    setAttribute(HTMLAttributes::marginheight(), value);
   }
   
   DOMString HTMLFrameElementImpl::marginWidth() const
   {
  -    return getAttribute(ATTR_MARGINWIDTH);
  +    return getAttribute(HTMLAttributes::marginwidth());
   }
   
   void HTMLFrameElementImpl::setMarginWidth(const DOMString &value)
   {
  -    setAttribute(ATTR_MARGINWIDTH, value);
  +    setAttribute(HTMLAttributes::marginwidth(), value);
   }
   
   DOMString HTMLFrameElementImpl::name() const
   {
  -    return getAttribute(ATTR_NAME);
  +    return getAttribute(HTMLAttributes::name());
   }
   
   void HTMLFrameElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   void HTMLFrameElementImpl::setNoResize(bool noResize)
   {
  -    setAttribute(ATTR_NORESIZE, noResize ? "" : 0);
  +    setAttribute(HTMLAttributes::noresize(), noResize ? "" : 0);
   }
   
   DOMString HTMLFrameElementImpl::scrolling() const
   {
  -    return getAttribute(ATTR_SCROLLING);
  +    return getAttribute(HTMLAttributes::scrolling());
   }
   
   void HTMLFrameElementImpl::setScrolling(const DOMString &value)
   {
  -    setAttribute(ATTR_SCROLLING, value);
  +    setAttribute(HTMLAttributes::scrolling(), value);
   }
   
   DOMString HTMLFrameElementImpl::src() const
   {
  -    return getAttribute(ATTR_SRC);
  +    return getAttribute(HTMLAttributes::src());
   }
   
   void HTMLFrameElementImpl::setSrc(const DOMString &value)
   {
  -    setAttribute(ATTR_SRC, value);
  +    setAttribute(HTMLAttributes::src(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -693,47 +656,39 @@
   
   void HTMLFrameSetElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_ROWS:
  -        if (attr->isNull()) break;
  -        if (m_rows) delete [] m_rows;
  -        m_rows = attr->value().toLengthArray(m_totalRows);
  -        setChanged();
  -    break;
  -    case ATTR_COLS:
  -        if (attr->isNull()) break;
  -        delete [] m_cols;
  -        m_cols = attr->value().toLengthArray(m_totalCols);
  -        setChanged();
  -    break;
  -    case ATTR_FRAMEBORDER:
  +    if (attr->name() == HTMLAttributes::rows()) {
  +        if (!attr->isNull()) {
  +            if (m_rows) delete [] m_rows;
  +            m_rows = attr->value().toLengthArray(m_totalRows);
  +            setChanged();
  +        }
  +    } else if (attr->name() == HTMLAttributes::cols()) {
  +        if (!attr->isNull()) {
  +            delete [] m_cols;
  +            m_cols = attr->value().toLengthArray(m_totalCols);
  +            setChanged();
  +        }
  +    } else if (attr->name() == HTMLAttributes::frameborder()) {
           // false or "no" or "0"..
           if ( attr->value().toInt() == 0 ) {
               frameborder = false;
               m_border = 0;
           }
           frameBorderSet = true;
  -        break;
  -    case ATTR_NORESIZE:
  +    } else if (attr->name() == HTMLAttributes::noresize()) {
           noresize = true;
  -        break;
  -    case ATTR_BORDER:
  +    } else if (attr->name() == HTMLAttributes::border()) {
           m_border = attr->value().toInt();
           if(!m_border)
               frameborder = false;
  -        break;
  -    case ATTR_ONLOAD:
  +    } else if (attr->name() == HTMLAttributes::onload()) {
           setHTMLEventListener(EventImpl::LOAD_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONUNLOAD:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onunload()) {
           setHTMLEventListener(EventImpl::UNLOAD_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    default:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   bool HTMLFrameSetElementImpl::rendererIsNeeded(RenderStyle *style)
  @@ -796,22 +751,22 @@
   
   DOMString HTMLFrameSetElementImpl::cols() const
   {
  -    return getAttribute(ATTR_COLS);
  +    return getAttribute(HTMLAttributes::cols());
   }
   
   void HTMLFrameSetElementImpl::setCols(const DOMString &value)
   {
  -    setAttribute(ATTR_COLS, value);
  +    setAttribute(HTMLAttributes::cols(), value);
   }
   
   DOMString HTMLFrameSetElementImpl::rows() const
   {
  -    return getAttribute(ATTR_ROWS);
  +    return getAttribute(HTMLAttributes::rows());
   }
   
   void HTMLFrameSetElementImpl::setRows(const DOMString &value)
   {
  -    setAttribute(ATTR_ROWS, value);
  +    setAttribute(HTMLAttributes::rows(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -827,12 +782,12 @@
   
   DOMString HTMLHeadElementImpl::profile() const
   {
  -    return getAttribute(ATTR_PROFILE);
  +    return getAttribute(HTMLAttributes::profile());
   }
   
   void HTMLHeadElementImpl::setProfile(const DOMString &value)
   {
  -    setAttribute(ATTR_PROFILE, value);
  +    setAttribute(HTMLAttributes::profile(), value);
   }
   
   bool HTMLHeadElementImpl::checkDTD(const NodeImpl* newChild)
  @@ -856,12 +811,12 @@
   
   DOMString HTMLHtmlElementImpl::version() const
   {
  -    return getAttribute(ATTR_VERSION);
  +    return getAttribute(HTMLAttributes::version());
   }
   
   void HTMLHtmlElementImpl::setVersion(const DOMString &value)
   {
  -    setAttribute(ATTR_VERSION, value);
  +    setAttribute(HTMLAttributes::version(), value);
   }
   
   bool HTMLHtmlElementImpl::checkDTD(const NodeImpl* newChild)
  @@ -886,39 +841,31 @@
   {
   }
   
  -bool HTMLIFrameElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLIFrameElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_WIDTH:
  -        case ATTR_HEIGHT:
  -            result = eUniversal;
  -            return false;
  -        case ATTR_ALIGN:
  -            result = eReplaced; // Share with <img> since the alignment behavior is the same.
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::width() || attrName == HTMLAttributes::height()) {
  +        result = eUniversal;
  +        return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    if (attrName == HTMLAttributes::align()) {
  +        result = eReplaced; // Share with <img> since the alignment behavior is the same.
  +        return false;
  +    }
  +    
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
  -void HTMLIFrameElementImpl::parseMappedAttribute(MappedAttributeImpl *attr )
  +void HTMLIFrameElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -  switch (  attr->id() )
  -  {
  -    case ATTR_WIDTH:
  -      addCSSLength( attr, CSS_PROP_WIDTH, attr->value());
  -      break;
  -    case ATTR_HEIGHT:
  -      addCSSLength( attr, CSS_PROP_HEIGHT, attr->value() );
  -      break;
  -    case ATTR_ALIGN:
  -      addHTMLAlignment( attr );
  -      break;
  -    default:
  -      HTMLFrameElementImpl::parseMappedAttribute( attr );
  -  }
  +    if (attr->name() == HTMLAttributes::width())
  +        addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  +    else if (attr->name() == HTMLAttributes::height())
  +        addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
  +    else if (attr->name() == HTMLAttributes::align())
  +        addHTMLAlignment(attr);
  +    else
  +      HTMLFrameElementImpl::parseMappedAttribute(attr);
   }
   
   bool HTMLIFrameElementImpl::rendererIsNeeded(RenderStyle *style)
  @@ -934,9 +881,9 @@
   
   void HTMLIFrameElementImpl::attach()
   {
  -    m_name = getAttribute(ATTR_NAME);
  +    m_name = getAttribute(HTMLAttributes::name());
       if (m_name.isNull())
  -        m_name = getAttribute(ATTR_ID);
  +        m_name = getAttribute(HTMLAttributes::idAttr());
       
       HTMLElementImpl::attach();
   
  @@ -969,40 +916,40 @@
   
   bool HTMLIFrameElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_SRC;
  +    return attr->name() == HTMLAttributes::src();
   }
   
   DOMString HTMLIFrameElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLIFrameElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLIFrameElementImpl::height() const
   {
  -    return getAttribute(ATTR_HEIGHT);
  +    return getAttribute(HTMLAttributes::height());
   }
   
   void HTMLIFrameElementImpl::setHeight(const DOMString &value)
   {
  -    setAttribute(ATTR_HEIGHT, value);
  +    setAttribute(HTMLAttributes::height(), value);
   }
   
   DOMString HTMLIFrameElementImpl::src() const
   {
  -    return getDocument()->completeURL(getAttribute(ATTR_SRC));
  +    return getDocument()->completeURL(getAttribute(HTMLAttributes::src()));
   }
   
   DOMString HTMLIFrameElementImpl::width() const
   {
  -    return getAttribute(ATTR_WIDTH);
  +    return getAttribute(HTMLAttributes::width());
   }
   
   void HTMLIFrameElementImpl::setWidth(const DOMString &value)
   {
  -    setAttribute(ATTR_WIDTH, value);
  +    setAttribute(HTMLAttributes::width(), value);
   }
  
  
  
  1.29      +2 -2      WebCore/khtml/html/html_baseimpl.h
  
  Index: html_baseimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_baseimpl.h,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- html_baseimpl.h	9 Jul 2005 20:19:09 -0000	1.28
  +++ html_baseimpl.h	18 Jul 2005 21:44:20 -0000	1.29
  @@ -57,7 +57,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
       virtual int tagPriority() const { return 10; }
       
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *);
   
       virtual void insertedIntoDocument();
  @@ -258,7 +258,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
       virtual int tagPriority() const { return 1; }
   
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       virtual void attach();
  
  
  
  1.21      +111 -158  WebCore/khtml/html/html_blockimpl.cpp
  
  Index: html_blockimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_blockimpl.cpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- html_blockimpl.cpp	12 Jul 2005 20:26:41 -0000	1.20
  +++ html_blockimpl.cpp	18 Jul 2005 21:44:20 -0000	1.21
  @@ -29,7 +29,6 @@
   
   #include "css/cssproperties.h"
   #include "css/cssvalues.h"
  -#include "misc/htmlhashes.h"
   
   #include <kdebug.h>
   
  @@ -47,12 +46,12 @@
   
   DOMString HTMLBlockquoteElementImpl::cite() const
   {
  -    return getAttribute(ATTR_CITE);
  +    return getAttribute(HTMLAttributes::cite());
   }
   
   void HTMLBlockquoteElementImpl::setCite(const DOMString &value)
   {
  -    setAttribute(ATTR_CITE, value);
  +    setAttribute(HTMLAttributes::cite(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -66,21 +65,18 @@
   {
   }
   
  -bool HTMLDivElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLDivElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    if (attr == ATTR_ALIGN) {
  +    if (attrName == HTMLAttributes::align()) {
           result = eBlock;
           return false;
       }
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
           
   void HTMLDivElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_ALIGN:
  -    {
  +    if (attr->name() == HTMLAttributes::align()) {
           DOMString v = attr->value();
   	if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
              addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
  @@ -90,21 +86,18 @@
               addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
           else
               addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
  -        break;
  -    }
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   DOMString HTMLDivElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLDivElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -118,27 +111,22 @@
   {
   }
   
  -bool HTMLHRElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLHRElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_ALIGN:
  -        case ATTR_WIDTH:
  -        case ATTR_COLOR:
  -        case ATTR_SIZE:
  -        case ATTR_NOSHADE:
  -            result = eHR;
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::align() ||
  +        attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::color() ||
  +        attrName == HTMLAttributes::size() ||
  +        attrName == HTMLAttributes::noshade()) {
  +        result = eHR;
  +        return false;
       }
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLHRElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch( attr->id() )
  -    {
  -    case ATTR_ALIGN: {
  +    if (attr->name() == HTMLAttributes::align()) {
           if (strcasecmp(attr->value(), "left") == 0) {
               addCSSProperty(attr, CSS_PROP_MARGIN_LEFT, "0");
   	    addCSSProperty(attr, CSS_PROP_MARGIN_RIGHT, CSS_VAL_AUTO);
  @@ -151,88 +139,76 @@
         	    addCSSProperty(attr, CSS_PROP_MARGIN_LEFT, CSS_VAL_AUTO);
               addCSSProperty(attr, CSS_PROP_MARGIN_RIGHT, CSS_VAL_AUTO);
   	}
  -        break;
  -    }
  -    case ATTR_WIDTH:
  -    {
  -        // cheap hack to cause linebreaks
  -        // khtmltests/html/strange_hr.html
  +    } else if (attr->name() == HTMLAttributes::width()) {
           bool ok;
           int v = attr->value().implementation()->toInt(&ok);
           if(ok && !v)
               addCSSLength(attr, CSS_PROP_WIDTH, "1");
           else
               addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  -        break;
  -    }
  -    case ATTR_COLOR:
  +    } else if (attr->name() == HTMLAttributes::color()) {
           addCSSProperty(attr, CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID);
           addCSSProperty(attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID);
           addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID);
           addCSSProperty(attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID);
           addCSSColor(attr, CSS_PROP_BORDER_COLOR, attr->value());
           addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
  -        break;
  -    case ATTR_NOSHADE:
  +    } else if (attr->name() == HTMLAttributes::noshade()) {
           addCSSProperty(attr, CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID);
           addCSSProperty(attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID);
           addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID);
           addCSSProperty(attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID);
           addCSSColor(attr, CSS_PROP_BORDER_COLOR, DOMString("grey"));
           addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, DOMString("grey"));
  -        break;
  -    case ATTR_SIZE: {
  +    } else if (attr->name() == HTMLAttributes::size()) {
           DOMStringImpl* si = attr->value().implementation();
           int size = si->toInt();
           if (size <= 1)
               addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_WIDTH, DOMString("0"));
           else
               addCSSLength(attr, CSS_PROP_HEIGHT, DOMString(QString::number(size-2)));
  -        break;
  -    }
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   DOMString HTMLHRElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLHRElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   bool HTMLHRElementImpl::noShade() const
   {
  -    return !getAttribute(ATTR_NOSHADE).isNull();
  +    return !getAttribute(HTMLAttributes::noshade()).isNull();
   }
   
   void HTMLHRElementImpl::setNoShade(bool noShade)
   {
  -    setAttribute(ATTR_NOSHADE, noShade ? "" : 0);
  +    setAttribute(HTMLAttributes::noshade(), noShade ? "" : 0);
   }
   
   DOMString HTMLHRElementImpl::size() const
   {
  -    return getAttribute(ATTR_SIZE);
  +    return getAttribute(HTMLAttributes::size());
   }
   
   void HTMLHRElementImpl::setSize(const DOMString &value)
   {
  -    setAttribute(ATTR_SIZE, value);
  +    setAttribute(HTMLAttributes::size(), value);
   }
   
   DOMString HTMLHRElementImpl::width() const
   {
  -    return getAttribute(ATTR_WIDTH);
  +    return getAttribute(HTMLAttributes::width());
   }
   
   void HTMLHRElementImpl::setWidth(const DOMString &value)
   {
  -    setAttribute(ATTR_WIDTH, value);
  +    setAttribute(HTMLAttributes::width(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -254,12 +230,12 @@
   
   DOMString HTMLHeadingElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLHeadingElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -274,45 +250,39 @@
       return inInlineTagList(newChild) || (getDocument()->inCompatMode() && newChild->hasTagName(HTMLNames::table()));
   }
   
  -bool HTMLParagraphElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLParagraphElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    if (attr == ATTR_ALIGN) {
  +    if (attrName == HTMLAttributes::align()) {
           result = eBlock; // We can share with DIV here.
           return false;
       }
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLParagraphElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -        case ATTR_ALIGN:
  -        {
  -            DOMString v = attr->value();
  -            if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
  -                addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
  -            else if (strcasecmp(attr->value(), "left") == 0)
  -                addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
  -            else if (strcasecmp(attr->value(), "right") == 0)
  -                addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
  -            else
  -                addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
  -            break;
  -        }
  -        default:
  -            HTMLElementImpl::parseMappedAttribute(attr);
  -    }
  +    if (attr->name() == HTMLAttributes::align()) {
  +        DOMString v = attr->value();
  +        if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
  +            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
  +        else if (strcasecmp(attr->value(), "left") == 0)
  +            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
  +        else if (strcasecmp(attr->value(), "right") == 0)
  +            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
  +        else
  +            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
  +    } else
  +        HTMLElementImpl::parseMappedAttribute(attr);
   }
   
   DOMString HTMLParagraphElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLParagraphElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -324,12 +294,12 @@
   
   long HTMLPreElementImpl::width() const
   {
  -    return getAttribute(ATTR_WIDTH).toInt();
  +    return getAttribute(HTMLAttributes::width()).toInt();
   }
   
   void HTMLPreElementImpl::setWidth(long width)
   {
  -    setAttribute(ATTR_WIDTH, QString::number(width));
  +    setAttribute(HTMLAttributes::width(), QString::number(width));
   }
   
   // -------------------------------------------------------------------------
  @@ -343,84 +313,67 @@
   {
   }
   
  -bool HTMLMarqueeElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLMarqueeElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_HEIGHT:   
  -        case ATTR_WIDTH:
  -        case ATTR_BGCOLOR:
  -        case ATTR_VSPACE:
  -        case ATTR_HSPACE:
  -        case ATTR_SCROLLAMOUNT:
  -        case ATTR_SCROLLDELAY:
  -        case ATTR_LOOP:
  -        case ATTR_BEHAVIOR:
  -        case ATTR_DIRECTION:
  -            result = eUniversal;
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::height() ||
  +        attrName == HTMLAttributes::bgcolor() ||
  +        attrName == HTMLAttributes::vspace() ||
  +        attrName == HTMLAttributes::hspace() ||
  +        attrName == HTMLAttributes::scrollamount() ||
  +        attrName == HTMLAttributes::scrolldelay() ||
  +        attrName == HTMLAttributes::loop() ||
  +        attrName == HTMLAttributes::behavior() ||
  +        attrName == HTMLAttributes::direction()) {
  +        result = eUniversal;
  +        return false;
       }
  -    
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
  -            
  +
   void HTMLMarqueeElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -        case ATTR_WIDTH:
  -            if (!attr->value().isEmpty())
  -                addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  -            break;
  -        case ATTR_HEIGHT:
  -            if (!attr->value().isEmpty())
  -                addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
  -            break;
  -        case ATTR_BGCOLOR:
  -            if (!attr->value().isEmpty())
  -                addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
  -            break;
  -        case ATTR_VSPACE:
  -            if (!attr->value().isEmpty()) {
  -                addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
  -                addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  -            }
  -            break;
  -        case ATTR_HSPACE:
  -            if (!attr->value().isEmpty()) {
  -                addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
  -                addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  -            }
  -            break;
  -        case ATTR_SCROLLAMOUNT:
  -            if (!attr->value().isEmpty())
  -                addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_INCREMENT, attr->value());
  -            break;
  -        case ATTR_SCROLLDELAY:
  -            if (!attr->value().isEmpty())
  -                addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_SPEED, attr->value());
  -            break;
  -        case ATTR_LOOP:
  -            if (!attr->value().isEmpty()) {
  -                if (attr->value() == "-1" || strcasecmp(attr->value(), "infinite") == 0)
  -                    addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
  -                else
  -                    addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_REPETITION, attr->value());
  -            }
  -            break;
  -        case ATTR_BEHAVIOR:
  -            if (!attr->value().isEmpty())
  -                addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_STYLE, attr->value());
  -            break;
  -        case ATTR_DIRECTION:
  -            if (!attr->value().isEmpty())
  -                addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_DIRECTION, attr->value());
  -            break;
  -        case ATTR_TRUESPEED:
  -            m_minimumDelay = !attr->isNull() ? 0 : defaultMinimumDelay;
  -            break;
  -        default:
  -            HTMLElementImpl::parseMappedAttribute(attr);
  -    }
  +    if (attr->name() == HTMLAttributes::width()) {
  +        if (!attr->value().isEmpty())
  +            addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  +    } else if (attr->name() == HTMLAttributes::height()) {
  +        if (!attr->value().isEmpty())
  +            addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
  +    } else if (attr->name() == HTMLAttributes::bgcolor()) {
  +        if (!attr->value().isEmpty())
  +            addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
  +    } else if (attr->name() == HTMLAttributes::vspace()) {
  +        if (!attr->value().isEmpty()) {
  +            addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
  +            addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  +        }
  +    } else if (attr->name() == HTMLAttributes::hspace()) {
  +        if (!attr->value().isEmpty()) {
  +            addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
  +            addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  +        }
  +    } else if (attr->name() == HTMLAttributes::scrollamount()) {
  +        if (!attr->value().isEmpty())
  +            addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_INCREMENT, attr->value());
  +    } else if (attr->name() == HTMLAttributes::scrolldelay()) {
  +        if (!attr->value().isEmpty())
  +            addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_SPEED, attr->value());
  +    } else if (attr->name() == HTMLAttributes::loop()) {
  +        if (!attr->value().isEmpty()) {
  +            if (attr->value() == "-1" || strcasecmp(attr->value(), "infinite") == 0)
  +                addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
  +            else
  +                addCSSLength(attr, CSS_PROP__KHTML_MARQUEE_REPETITION, attr->value());
  +        }
  +    } else if (attr->name() == HTMLAttributes::behavior()) {
  +        if (!attr->value().isEmpty())
  +            addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_STYLE, attr->value());
  +    } else if (attr->name() == HTMLAttributes::direction()) {
  +        if (!attr->value().isEmpty())
  +            addCSSProperty(attr, CSS_PROP__KHTML_MARQUEE_DIRECTION, attr->value());
  +    } else if (attr->name() == HTMLAttributes::truespeed()) {
  +        m_minimumDelay = !attr->isNull() ? 0 : defaultMinimumDelay;
  +    } else
  +        HTMLElementImpl::parseMappedAttribute(attr);
   }
  
  
  
  1.11      +7 -7      WebCore/khtml/html/html_blockimpl.h
  
  Index: html_blockimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_blockimpl.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- html_blockimpl.h	9 Jul 2005 20:19:09 -0000	1.10
  +++ html_blockimpl.h	18 Jul 2005 21:44:20 -0000	1.11
  @@ -59,8 +59,8 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
       virtual int tagPriority() const { return 5; }
       
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  -    virtual void parseMappedAttribute(MappedAttributeImpl *token);
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
  +    virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       DOMString align() const;
       void setAlign(const DOMString &);
  @@ -77,8 +77,8 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; }
       virtual int tagPriority() const { return 0; }
       
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  -    virtual void parseMappedAttribute(MappedAttributeImpl *);
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
  +    virtual void parseMappedAttribute(MappedAttributeImpl* attr);
   
       DOMString align() const;
       void setAlign(const DOMString &);
  @@ -119,7 +119,7 @@
       virtual int tagPriority() const { return 3; }
       virtual bool checkDTD(const NodeImpl* newChild);
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       DOMString align() const;
  @@ -150,8 +150,8 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
       virtual int tagPriority() const { return 3; }
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  -    virtual void parseMappedAttribute(MappedAttributeImpl *token);
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
  +    virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       int minimumDelay() const { return m_minimumDelay; }
       
  
  
  
  1.5       +7 -15     WebCore/khtml/html/html_canvasimpl.cpp
  
  Index: html_canvasimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_canvasimpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- html_canvasimpl.cpp	9 Jul 2005 20:19:09 -0000	1.4
  +++ html_canvasimpl.cpp	18 Jul 2005 21:44:20 -0000	1.5
  @@ -26,7 +26,6 @@
   #include "html/html_canvasimpl.h"
   #include "html/html_documentimpl.h"
   
  -#include "misc/htmlhashes.h"
   #include "khtmlview.h"
   #include "khtml_part.h"
   
  @@ -63,26 +62,19 @@
   {
   }
   
  -bool HTMLCanvasElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLCanvasElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    return HTMLImageElementImpl::mapToEntry(attr, result);
  +    if (attrName != HTMLAttributes::src()) // Ignore the src attribute
  +        return HTMLImageElementImpl::mapToEntry(attrName, result);
  +    return false;
   }
   
   void HTMLCanvasElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id())
  -    {
  -        case ATTR_SRC: {
  -            // Do nothing.  
  -            break;
  -        }
  -        default: {
  -            HTMLImageElementImpl::parseMappedAttribute(attr);
  -        }
  -    }
  +    if (attr->name() != HTMLAttributes::src()) // Canvas ignores the src attribute
  +        HTMLImageElementImpl::parseMappedAttribute(attr);
   }
   
  -
   RenderObject *HTMLCanvasElementImpl::createRenderer(RenderArena *arena, RenderStyle *style)
   {
        return new (arena) RenderCanvasImage(this);
  @@ -102,5 +94,5 @@
   
   bool HTMLCanvasElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return ((attr->id() == ATTR_USEMAP && attr->value().domString()[0] != '#'));
  +    return ((attr->name() == HTMLAttributes::usemap() && attr->value().domString()[0] != '#'));
   }
  
  
  
  1.4       +1 -1      WebCore/khtml/html/html_canvasimpl.h
  
  Index: html_canvasimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_canvasimpl.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- html_canvasimpl.h	9 Jul 2005 20:19:09 -0000	1.3
  +++ html_canvasimpl.h	18 Jul 2005 21:44:20 -0000	1.4
  @@ -45,7 +45,7 @@
       HTMLCanvasElementImpl(DocumentPtr *doc);
       ~HTMLCanvasElementImpl();
   
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *);
   
       virtual void attach();
  
  
  
  1.62      +0 -2      WebCore/khtml/html/html_documentimpl.cpp
  
  Index: html_documentimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_documentimpl.cpp,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- html_documentimpl.cpp	9 Jul 2005 20:19:09 -0000	1.61
  +++ html_documentimpl.cpp	18 Jul 2005 21:44:20 -0000	1.62
  @@ -66,8 +66,6 @@
   #include "khtml_part.h"
   #include "khtmlpart_p.h"
   #include "khtml_settings.h"
  -#include "misc/htmlattrs.h"
  -#include "misc/htmlhashes.h"
   
   #include "xml/xml_tokenizer.h"
   #include "xml/dom2_eventsimpl.h"
  
  
  
  1.89      +73 -119   WebCore/khtml/html/html_elementimpl.cpp
  
  Index: html_elementimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_elementimpl.cpp,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- html_elementimpl.cpp	9 Jul 2005 20:19:09 -0000	1.88
  +++ html_elementimpl.cpp	18 Jul 2005 21:44:20 -0000	1.89
  @@ -33,7 +33,6 @@
   #include "html/htmltokenizer.h"
   #include "htmlfactory.h"
   
  -#include "misc/htmlhashes.h"
   #include "misc/hashset.h"
   #include "editing/visible_text.h"
   
  @@ -117,172 +116,127 @@
       return clone;
   }
   
  -bool HTMLElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr)
  -    {
  -        case ATTR_ALIGN:
  -        case ATTR_CONTENTEDITABLE:
  -        case ATTR_DIR:
  -            result = eUniversal;
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::align() ||
  +        attrName == HTMLAttributes::contenteditable() ||
  +        attrName == HTMLAttributes::dir()) {
  +        result = eUniversal;
  +        return false;
       }
   
  -    return StyledElementImpl::mapToEntry(attr, result);
  +    return StyledElementImpl::mapToEntry(attrName, result);
   }
       
   void HTMLElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    if (attr->id() == ATTR_ID || attr->id() == ATTR_CLASS || attr->id() == ATTR_STYLE)
  +    if (attr->name() == HTMLAttributes::idAttr() || attr->name() == HTMLAttributes::classAttr() || attr->name() == HTMLAttributes::style())
           return StyledElementImpl::parseMappedAttribute(attr);
   
       DOMString indexstring;
  -    switch (attr->id())
  -    {
  -    case ATTR_ALIGN:
  +    if (attr->name() == HTMLAttributes::align()) {
           if (strcasecmp(attr->value(), "middle" ) == 0)
               addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, "center");
           else
               addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, attr->value());
  -        break;
  -    case ATTR_CONTENTEDITABLE:
  +    } else if (attr->name() == HTMLAttributes::contenteditable()) {
           setContentEditable(attr);
  -        break;
  -    case ATTR_TABINDEX:
  -        indexstring=getAttribute(ATTR_TABINDEX);
  +    } else if (attr->name() == HTMLAttributes::tabindex()) {
  +        indexstring = getAttribute(HTMLAttributes::tabindex());
           if (indexstring.length())
               setTabIndex(indexstring.toInt());
  -        break;
  -// i18n attributes
  -    case ATTR_LANG:
  -        break;
  -    case ATTR_DIR:
  +    } else if (attr->name() == HTMLAttributes::lang()) {
  +        // FIXME: Implement
  +    } else if (attr->name() == HTMLAttributes::direction()) {
           addCSSProperty(attr, CSS_PROP_DIRECTION, attr->value());
           addCSSProperty(attr, CSS_PROP_UNICODE_BIDI, CSS_VAL_EMBED);
  -        break;
  +    }
   // standard events
  -    case ATTR_ONCLICK:
  -	setHTMLEventListener(EventImpl::KHTML_CLICK_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONCONTEXTMENU:
  -	setHTMLEventListener(EventImpl::CONTEXTMENU_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONDBLCLICK:
  +    else if (attr->name() == HTMLAttributes::onclick()) {
  +        setHTMLEventListener(EventImpl::KHTML_CLICK_EVENT,
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::oncontextmenu()) {
  +    	setHTMLEventListener(EventImpl::CONTEXTMENU_EVENT,
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::ondblclick()) {
   	setHTMLEventListener(EventImpl::KHTML_DBLCLICK_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONMOUSEDOWN:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onmousedown()) {
           setHTMLEventListener(EventImpl::MOUSEDOWN_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONMOUSEMOVE:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onmousemove()) {
           setHTMLEventListener(EventImpl::MOUSEMOVE_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONMOUSEOUT:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onmouseout()) {
           setHTMLEventListener(EventImpl::MOUSEOUT_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONMOUSEOVER:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onmouseover()) {
           setHTMLEventListener(EventImpl::MOUSEOVER_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONMOUSEUP:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onmouseup()) {
           setHTMLEventListener(EventImpl::MOUSEUP_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONMOUSEWHEEL:
  +	                     getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onmousewheel()) {
           setHTMLEventListener(EventImpl::MOUSEWHEEL_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONFOCUS:
  +                            getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onfocus()) {
           setHTMLEventListener(EventImpl::DOMFOCUSIN_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONKEYDOWN:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onkeydown()) {
           setHTMLEventListener(EventImpl::KEYDOWN_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -	break;
  -    case ATTR_ONKEYPRESS:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onkeypress()) {
           setHTMLEventListener(EventImpl::KEYPRESS_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -	break;
  -    case ATTR_ONKEYUP:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onkeyup()) {
           setHTMLEventListener(EventImpl::KEYUP_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONSCROLL:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onscroll()) {
           setHTMLEventListener(EventImpl::SCROLL_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONBEFORECUT:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onbeforecut()) {
           setHTMLEventListener(EventImpl::BEFORECUT_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONCUT:
  +    } else if (attr->name() == HTMLAttributes::oncut()) {
           setHTMLEventListener(EventImpl::CUT_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONBEFORECOPY:
  +    } else if (attr->name() == HTMLAttributes::onbeforecopy()) {
           setHTMLEventListener(EventImpl::BEFORECOPY_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONCOPY:
  +    } else if (attr->name() == HTMLAttributes::oncopy()) {
           setHTMLEventListener(EventImpl::COPY_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONBEFOREPASTE:
  +    } else if (attr->name() == HTMLAttributes::onbeforepaste()) {
           setHTMLEventListener(EventImpl::BEFOREPASTE_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONPASTE:
  +    } else if (attr->name() == HTMLAttributes::onpaste()) {
           setHTMLEventListener(EventImpl::PASTE_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;        
  -    case ATTR_ONDRAGENTER:
  +    } else if (attr->name() == HTMLAttributes::ondragenter()) {
           setHTMLEventListener(EventImpl::DRAGENTER_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONDRAGOVER:
  +    } else if (attr->name() == HTMLAttributes::ondragover()) {
           setHTMLEventListener(EventImpl::DRAGOVER_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONDRAGLEAVE:
  +    } else if (attr->name() == HTMLAttributes::ondragleave()) {
           setHTMLEventListener(EventImpl::DRAGLEAVE_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONDROP:
  +    } else if (attr->name() == HTMLAttributes::ondrop()) {
           setHTMLEventListener(EventImpl::DROP_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONDRAGSTART:
  +    } else if (attr->name() == HTMLAttributes::ondragstart()) {
           setHTMLEventListener(EventImpl::DRAGSTART_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONDRAG:
  +    } else if (attr->name() == HTMLAttributes::ondrag()) {
           setHTMLEventListener(EventImpl::DRAG_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONDRAGEND:
  +    } else if (attr->name() == HTMLAttributes::ondragend()) {
           setHTMLEventListener(EventImpl::DRAGEND_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONSELECTSTART:
  +    } else if (attr->name() == HTMLAttributes::onselectstart()) {
           setHTMLEventListener(EventImpl::SELECTSTART_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -        // other misc attributes
  -    default:
  -#ifdef UNSUPPORTED_ATTR
  -	kdDebug(6030) << "UATTR: <" << this->nodeName().string() << "> ["
  -		      << attr->name().string() << "]=[" << attr->value().string() << "]" << endl;
  -#endif
  -        break;
  -    }
  +    } 
   }
   
   DOMString HTMLElementImpl::innerHTML() const
  @@ -586,10 +540,10 @@
   void HTMLElementImpl::setContentEditable(const DOMString &enabled) {
       if (enabled == "inherit") {
           int exceptionCode;
  -        removeAttribute(ATTR_CONTENTEDITABLE, exceptionCode);
  +        removeAttribute(HTMLAttributes::contenteditable(), exceptionCode);
       }
       else
  -        setAttribute(ATTR_CONTENTEDITABLE, enabled.isEmpty() ? "true" : enabled);
  +        setAttribute(HTMLAttributes::contenteditable(), enabled.isEmpty() ? "true" : enabled);
   }
   
   void HTMLElementImpl::click(bool sendMouseEvents)
  @@ -646,52 +600,52 @@
   
   DOMString HTMLElementImpl::id() const
   {
  -    return getAttribute(ATTR_ID);
  +    return getAttribute(HTMLAttributes::idAttr());
   }
   
   void HTMLElementImpl::setId(const DOMString &value)
   {
  -    setAttribute(ATTR_ID, value);
  +    setAttribute(HTMLAttributes::idAttr(), value);
   }
   
   DOMString HTMLElementImpl::title() const
   {
  -    return getAttribute(ATTR_TITLE);
  +    return getAttribute(HTMLAttributes::title());
   }
   
   void HTMLElementImpl::setTitle(const DOMString &value)
   {
  -    setAttribute(ATTR_TITLE, value);
  +    setAttribute(HTMLAttributes::title(), value);
   }
   
   DOMString HTMLElementImpl::lang() const
   {
  -    return getAttribute(ATTR_LANG);
  +    return getAttribute(HTMLAttributes::lang());
   }
   
   void HTMLElementImpl::setLang(const DOMString &value)
   {
  -    setAttribute(ATTR_LANG, value);
  +    setAttribute(HTMLAttributes::lang(), value);
   }
   
   DOMString HTMLElementImpl::dir() const
   {
  -    return getAttribute(ATTR_DIR);
  +    return getAttribute(HTMLAttributes::dir());
   }
   
   void HTMLElementImpl::setDir(const DOMString &value)
   {
  -    setAttribute(ATTR_DIR, value);
  +    setAttribute(HTMLAttributes::dir(), value);
   }
   
   DOMString HTMLElementImpl::className() const
   {
  -    return getAttribute(ATTR_CLASS);
  +    return getAttribute(HTMLAttributes::classAttr());
   }
   
   void HTMLElementImpl::setClassName(const DOMString &value)
   {
  -    setAttribute(ATTR_CLASS, value);
  +    setAttribute(HTMLAttributes::classAttr(), value);
   }
   
   SharedPtr<HTMLCollectionImpl> HTMLElementImpl::children()
  
  
  
  1.37      +1 -1      WebCore/khtml/html/html_elementimpl.h
  
  Index: html_elementimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_elementimpl.h,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- html_elementimpl.h	9 Jul 2005 20:19:10 -0000	1.36
  +++ html_elementimpl.h	18 Jul 2005 21:44:20 -0000	1.37
  @@ -45,7 +45,7 @@
   
       virtual DOMString nodeName() const;
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl* attr);
   
       virtual NodeImpl* cloneNode(bool deep);
  
  
  
  1.172     +221 -321  WebCore/khtml/html/html_formimpl.cpp
  
  Index: html_formimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -r1.171 -r1.172
  --- html_formimpl.cpp	9 Jul 2005 20:19:10 -0000	1.171
  +++ html_formimpl.cpp	18 Jul 2005 21:44:20 -0000	1.172
  @@ -33,7 +33,6 @@
   #include "html/html_documentimpl.h"
   #include "html_imageimpl.h"
   #include "khtml_settings.h"
  -#include "misc/htmlhashes.h"
   #include "misc/formdata.h"
   
   #include "dom/dom_exception.h"
  @@ -623,11 +622,9 @@
   
   void HTMLFormElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_ACTION:
  +    if (attr->name() == HTMLAttributes::action()) 
   #if APPLE_CHANGES
  -        {
  +    {
           bool oldURLWasSecure = formWouldHaveSecureSubmission(m_url);
   #endif
           m_url = khtml::parseURL(attr->value());
  @@ -639,65 +636,50 @@
                   getDocument()->secureFormAdded();
               else
                   getDocument()->secureFormRemoved();
  -        }
  +    }
   #endif
  -        break;
  -    case ATTR_TARGET:
  +    else if (attr->name() == HTMLAttributes::target()) {
           m_target = attr->value();
  -        break;
  -    case ATTR_METHOD:
  +    } else if (attr->name() == HTMLAttributes::method()) {
           if ( strcasecmp( attr->value(), "post" ) == 0 )
               m_post = true;
           else if ( strcasecmp( attr->value(), "get" ) == 0 )
               m_post = false;
  -        break;
  -    case ATTR_ENCTYPE:
  +    } else if (attr->name() == HTMLAttributes::enctype()) {
           parseEnctype(attr->value());
  -        break;
  -    case ATTR_ACCEPT_CHARSET:
  +    } else if (attr->name() == HTMLAttributes::accept_charset()) {
           // space separated list of charsets the server
           // accepts - see rfc2045
           m_acceptcharset = attr->value();
  -        break;
  -    case ATTR_ACCEPT:
  +    } else if (attr->name() == HTMLAttributes::accept()) {
           // ignore this one for the moment...
  -        break;
  -    case ATTR_AUTOCOMPLETE:
  +    } else if (attr->name() == HTMLAttributes::autocomplete()) {
           m_autocomplete = strcasecmp( attr->value(), "off" );
  -        break;
  -    case ATTR_ONSUBMIT:
  +    } else if (attr->name() == HTMLAttributes::onsubmit()) {
           setHTMLEventListener(EventImpl::SUBMIT_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONRESET:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onreset()) {
           setHTMLEventListener(EventImpl::RESET_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_NAME:
  -	{
  -	    QString newNameAttr = attr->value().string();
  -	    if (attached() && getDocument()->isHTMLDocument()) {
  -		HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
  -		document->removeNamedImageOrForm(oldNameAttr);
  -		document->addNamedImageOrForm(newNameAttr);
  -	    }
  -	    oldNameAttr = newNameAttr;
  -	}
  -	break;
  -    case ATTR_ID:
  -	{
  -	    QString newIdAttr = attr->value().string();
  -	    if (attached() && getDocument()->isHTMLDocument()) {
  -		HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
  -		document->removeNamedImageOrForm(oldIdAttr);
  -		document->addNamedImageOrForm(newIdAttr);
  -	    }
  -	    oldIdAttr = newIdAttr;
  -	}
  -	// fall through
  -    default:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::name()) {
  +        QString newNameAttr = attr->value().string();
  +        if (attached() && getDocument()->isHTMLDocument()) {
  +            HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
  +            document->removeNamedImageOrForm(oldNameAttr);
  +            document->addNamedImageOrForm(newNameAttr);
  +        }
  +        oldNameAttr = newNameAttr;
  +    } else if (attr->name() == HTMLAttributes::idAttr()) {
  +        QString newIdAttr = attr->value().string();
  +        if (attached() && getDocument()->isHTMLDocument()) {
  +            HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
  +            document->removeNamedImageOrForm(oldIdAttr);
  +            document->addNamedImageOrForm(newIdAttr);
  +        }
  +        oldIdAttr = newIdAttr;
  +        HTMLElementImpl::parseMappedAttribute(attr);
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLFormElementImpl::radioClicked( HTMLGenericFormElementImpl *caller )
  @@ -784,7 +766,7 @@
   
   bool HTMLFormElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_ACTION;
  +    return attr->name() == HTMLAttributes::action();
   }
   
   void HTMLFormElementImpl::registerImgElement(HTMLImageElementImpl *e)
  @@ -804,57 +786,57 @@
   
   DOMString HTMLFormElementImpl::name() const
   {
  -    return getAttribute(ATTR_NAME);
  +    return getAttribute(HTMLAttributes::name());
   }
   
   void HTMLFormElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   DOMString HTMLFormElementImpl::acceptCharset() const
   {
  -    return getAttribute(ATTR_ACCEPT_CHARSET);
  +    return getAttribute(HTMLAttributes::accept_charset());
   }
   
   void HTMLFormElementImpl::setAcceptCharset(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCEPT_CHARSET, value);
  +    setAttribute(HTMLAttributes::accept_charset(), value);
   }
   
   DOMString HTMLFormElementImpl::action() const
   {
  -    return getAttribute(ATTR_ACTION);
  +    return getAttribute(HTMLAttributes::action());
   }
   
   void HTMLFormElementImpl::setAction(const DOMString &value)
   {
  -    setAttribute(ATTR_ACTION, value);
  +    setAttribute(HTMLAttributes::action(), value);
   }
   
   void HTMLFormElementImpl::setEnctype(const DOMString &value)
   {
  -    setAttribute(ATTR_ENCTYPE, value);
  +    setAttribute(HTMLAttributes::enctype(), value);
   }
   
   DOMString HTMLFormElementImpl::method() const
   {
  -    return getAttribute(ATTR_METHOD);
  +    return getAttribute(HTMLAttributes::method());
   }
   
   void HTMLFormElementImpl::setMethod(const DOMString &value)
   {
  -    setAttribute(ATTR_METHOD, value);
  +    setAttribute(HTMLAttributes::method(), value);
   }
   
   DOMString HTMLFormElementImpl::target() const
   {
  -    return getAttribute(ATTR_TARGET);
  +    return getAttribute(HTMLAttributes::target());
   }
   
   void HTMLFormElementImpl::setTarget(const DOMString &value)
   {
  -    setAttribute(ATTR_TARGET, value);
  +    setAttribute(HTMLAttributes::target(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -881,26 +863,19 @@
   
   void HTMLGenericFormElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_NAME:
  -        break;
  -    case ATTR_DISABLED: {
  +    if (attr->name() == HTMLAttributes::name()) {
  +        // Do nothing.
  +    } else if (attr->name() == HTMLAttributes::disabled()) {
           bool oldDisabled = m_disabled;
           m_disabled = !attr->isNull();
           if (oldDisabled != m_disabled)
               setChanged();
  -        break;
  -    }
  -    case ATTR_READONLY: {
  +    } else if (attr->name() == HTMLAttributes::readonly()) {
           bool oldReadOnly = m_readOnly;
           m_readOnly = !attr->isNull();
           if (oldReadOnly != m_readOnly) setChanged();
  -        break;
  -    }
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLGenericFormElementImpl::attach()
  @@ -978,13 +953,13 @@
       if (!m_overrideName.isNull())
           return m_overrideName;
   
  -    DOMString n = getAttribute(ATTR_NAME);
  +    DOMString n = getAttribute(HTMLAttributes::name());
       return n.isNull() ? "" : n;
   }
   
   void HTMLGenericFormElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   void HTMLGenericFormElementImpl::setOverrideName(const DOMString& value)
  @@ -1011,12 +986,12 @@
   
   void HTMLGenericFormElementImpl::setDisabled(bool b)
   {
  -    setAttribute(ATTR_DISABLED, b ? "" : 0);
  +    setAttribute(HTMLAttributes::disabled(), b ? "" : 0);
   }
   
   void HTMLGenericFormElementImpl::setReadOnly(bool b)
   {
  -    setAttribute(ATTR_READONLY, b ? "" : 0);
  +    setAttribute(HTMLAttributes::readonly(), b ? "" : 0);
   }
   
   void HTMLGenericFormElementImpl::recalcStyle( StyleChange ch )
  @@ -1172,12 +1147,12 @@
   
   long HTMLGenericFormElementImpl::tabIndex() const
   {
  -    return getAttribute(ATTR_TABINDEX).toInt();
  +    return getAttribute(HTMLAttributes::tabindex()).toInt();
   }
   
   void HTMLGenericFormElementImpl::setTabIndex(long value)
   {
  -    setAttribute(ATTR_TABINDEX, QString::number(value));
  +    setAttribute(HTMLAttributes::tabindex(), QString::number(value));
   }
   
   // -------------------------------------------------------------------------
  @@ -1196,7 +1171,7 @@
   
   DOMString HTMLButtonElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLButtonElementImpl::blur()
  @@ -1212,33 +1187,26 @@
   
   void HTMLButtonElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_TYPE:
  +    if (attr->name() ==  HTMLAttributes::type()) {
           if ( strcasecmp( attr->value(), "submit" ) == 0 )
               m_type = SUBMIT;
           else if ( strcasecmp( attr->value(), "reset" ) == 0 )
               m_type = RESET;
           else if ( strcasecmp( attr->value(), "button" ) == 0 )
               m_type = BUTTON;
  -        break;
  -    case ATTR_VALUE:
  +    } else if (attr->name() == HTMLAttributes::value()) {
           m_value = attr->value();
           m_currValue = m_value;
  -        break;
  -    case ATTR_ACCESSKEY:
  -        break;
  -    case ATTR_ONFOCUS:
  +    } else if (attr->name() == HTMLAttributes::accesskey()) {
  +        // Do nothing.
  +    } else if (attr->name() == HTMLAttributes::onfocus()) {
           setHTMLEventListener(EventImpl::FOCUS_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONBLUR:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onblur()) {
           setHTMLEventListener(EventImpl::BLUR_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    default:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else
           HTMLGenericFormElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLButtonElementImpl::defaultEventHandler(EventImpl *evt)
  @@ -1294,22 +1262,22 @@
   
   DOMString HTMLButtonElementImpl::accessKey() const
   {
  -    return getAttribute(ATTR_ACCESSKEY);
  +    return getAttribute(HTMLAttributes::accesskey());
   }
   
   void HTMLButtonElementImpl::setAccessKey(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCESSKEY, value);
  +    setAttribute(HTMLAttributes::accesskey(), value);
   }
   
   DOMString HTMLButtonElementImpl::value() const
   {
  -    return getAttribute(ATTR_VALUE);
  +    return getAttribute(HTMLAttributes::value());
   }
   
   void HTMLButtonElementImpl::setValue(const DOMString &value)
   {
  -    setAttribute(ATTR_VALUE, value);
  +    setAttribute(HTMLAttributes::value(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -1428,7 +1396,7 @@
           if (newType == FILE && m_haveType) {
               // Set the attribute back to the old value.
               // Useful in case we were called from inside parseMappedAttribute.
  -            setAttribute(ATTR_TYPE, type());
  +            setAttribute(HTMLAttributes::type(), type());
           } else {
               bool wasAttached = m_attached;
               if (wasAttached)
  @@ -1437,11 +1405,11 @@
               m_type = newType;
               bool willStoreValue = storesValueSeparateFromAttribute();
               if (didStoreValue && !willStoreValue && !m_value.isNull()) {
  -                setAttribute(ATTR_VALUE, m_value);
  +                setAttribute(HTMLAttributes::value(), m_value);
                   m_value = DOMString();
               }
               if (!didStoreValue && willStoreValue) {
  -                m_value = getAttribute(ATTR_VALUE);
  +                m_value = getAttribute(HTMLAttributes::value());
               }
               if (wasAttached)
                   attach();
  @@ -1714,131 +1682,107 @@
       }
   }
   
  -bool HTMLInputElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLInputElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_WIDTH:
  -        case ATTR_HEIGHT:
  -        case ATTR_VSPACE:
  -        case ATTR_HSPACE:
  -            result = eUniversal;
  -            return false;
  -        case ATTR_ALIGN:
  -            result = eReplaced; // Share with <img> since the alignment behavior is the same.
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::height() ||
  +        attrName == HTMLAttributes::vspace() ||
  +        attrName == HTMLAttributes::hspace()) {
  +        result = eUniversal;
  +        return false;
  +    } 
  +    
  +    if (attrName == HTMLAttributes::align()) {
  +        result = eReplaced; // Share with <img> since the alignment behavior is the same.
  +        return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLInputElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_AUTOCOMPLETE:
  +    if (attr->name() == HTMLAttributes::autocomplete()) {
           m_autocomplete = strcasecmp( attr->value(), "off" );
  -        break;
  -    case ATTR_TYPE:
  +    } else if (attr->name() ==  HTMLAttributes::type()) {
           setType(attr->value());
           if (m_type != IMAGE && m_imageLoader) {
               delete m_imageLoader;
               m_imageLoader = 0;
           }
  -        break;
  -    case ATTR_VALUE:
  +    } else if (attr->name() == HTMLAttributes::value()) {
           // We only need to setChanged if the form is looking at the default value right now.
           if (m_value.isNull())
               setChanged();
           m_valueMatchesRenderer = false;
  -        break;
  -    case ATTR_CHECKED:
  +    } else if (attr->name() == HTMLAttributes::checked()) {
           m_defaultChecked = !attr->isNull();
           if (m_useDefaultChecked) {
               setChecked(m_defaultChecked);
               m_useDefaultChecked = true;
           }
  -        break;
  -    case ATTR_MAXLENGTH:
  +    } else if (attr->name() == HTMLAttributes::maxlength()) {
           m_maxLen = !attr->isNull() ? attr->value().toInt() : -1;
           setChanged();
  -        break;
  -    case ATTR_SIZE:
  +    } else if (attr->name() == HTMLAttributes::size()) {
           m_size = !attr->isNull() ? attr->value().toInt() : 20;
  -        break;
  -    case ATTR_ALT:
  +    } else if (attr->name() == HTMLAttributes::alt()) {
           if (m_render && m_type == IMAGE)
               static_cast<RenderImage*>(m_render)->updateAltText();
  -        break;
  -    case ATTR_SRC:
  +    } else if (attr->name() == HTMLAttributes::src()) {
           if (m_render && m_type == IMAGE) {
               if (!m_imageLoader)
                   m_imageLoader = new HTMLImageLoader(this);
               m_imageLoader->updateFromElement();
           }
  -        break;
  -    case ATTR_USEMAP:
  -    case ATTR_ACCESSKEY:
  -        // ### ignore for the moment
  -        break;
  -    case ATTR_VSPACE:
  +    } else if (attr->name() == HTMLAttributes::usemap() ||
  +               attr->name() == HTMLAttributes::accesskey()) {
  +        // FIXME: ignore for the moment
  +    } else if (attr->name() == HTMLAttributes::vspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  -        break;
  -    case ATTR_HSPACE:
  +    } else if (attr->name() == HTMLAttributes::hspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  -        break;        
  -    case ATTR_ALIGN:
  +    } else if (attr->name() == HTMLAttributes::align()) {
           addHTMLAlignment(attr);
  -        break;
  -    case ATTR_WIDTH:
  -        addCSSLength(attr, CSS_PROP_WIDTH, attr->value() );
  -        break;
  -    case ATTR_HEIGHT:
  -        addCSSLength(attr, CSS_PROP_HEIGHT, attr->value() );
  -        break;
  -    case ATTR_ONFOCUS:
  +    } else if (attr->name() == HTMLAttributes::width()) {
  +        addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  +    } else if (attr->name() == HTMLAttributes::height()) {
  +        addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
  +    } else if (attr->name() == HTMLAttributes::onfocus()) {
           setHTMLEventListener(EventImpl::FOCUS_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONBLUR:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onblur()) {
           setHTMLEventListener(EventImpl::BLUR_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONSELECT:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onselect()) {
           setHTMLEventListener(EventImpl::SELECT_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONCHANGE:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onchange()) {
           setHTMLEventListener(EventImpl::CHANGE_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONINPUT:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::oninput()) {
           setHTMLEventListener(EventImpl::INPUT_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  +    }
       // Search field and slider attributes all just cause updateFromElement to be called through style
       // recalcing.
  -    case ATTR_ONSEARCH:
  +    else if (attr->name() == HTMLAttributes::onsearch()) {
           setHTMLEventListener(EventImpl::SEARCH_EVENT,
                                getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_RESULTS:
  +    } else if (attr->name() == HTMLAttributes::results()) {
           m_maxResults = !attr->isNull() ? attr->value().toInt() : -1;
  -        /* Fall through */
  -    case ATTR_AUTOSAVE:
  -    case ATTR_INCREMENTAL:
  -    case ATTR_PLACEHOLDER:
  -    case ATTR_MIN:
  -    case ATTR_MAX:
  -    case ATTR_PRECISION:
           setChanged();
  -        break;
  -    default:
  +    } else if (attr->name() == HTMLAttributes::autosave() ||
  +               attr->name() == HTMLAttributes::incremental() ||
  +               attr->name() == HTMLAttributes::placeholder() ||
  +               attr->name() == HTMLAttributes::min() ||
  +               attr->name() == HTMLAttributes::max() ||
  +               attr->name() == HTMLAttributes::precision()) {
  +        setChanged();
  +    } else
           HTMLGenericFormElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   bool HTMLInputElementImpl::rendererIsNeeded(RenderStyle *style)
  @@ -1895,11 +1839,11 @@
   {
       if (!m_inited) {
           if (!m_haveType)
  -            setType(getAttribute(ATTR_TYPE));
  +            setType(getAttribute(HTMLAttributes::type()));
   
           // FIXME: This needs to be dynamic, doesn't it, since someone could set this
           // after attachment?
  -        DOMString val = getAttribute(ATTR_VALUE);
  +        DOMString val = getAttribute(HTMLAttributes::value());
           if ((uint) m_type <= ISINDEX && !val.isEmpty()) {
               // remove newline stuff..
               QString nvalue;
  @@ -1908,10 +1852,10 @@
                       nvalue += val[i];
   
               if (val.length() != nvalue.length())
  -                setAttribute(ATTR_VALUE, nvalue);
  +                setAttribute(HTMLAttributes::value(), nvalue);
           }
   
  -        m_defaultChecked = (!getAttribute(ATTR_CHECKED).isNull());
  +        m_defaultChecked = (!getAttribute(HTMLAttributes::checked()).isNull());
           
           m_inited = true;
       }
  @@ -1919,9 +1863,9 @@
       // Disallow the width attribute on inputs other than HIDDEN and IMAGE.
       // Dumb Web sites will try to set the width as an attribute on form controls that aren't
       // images or hidden.
  -    if (hasMappedAttributes() && m_type != HIDDEN && m_type != IMAGE && !getAttribute(ATTR_WIDTH).isEmpty()) {
  +    if (hasMappedAttributes() && m_type != HIDDEN && m_type != IMAGE && !getAttribute(HTMLAttributes::width()).isEmpty()) {
           int excCode;
  -        removeAttribute(ATTR_WIDTH, excCode);
  +        removeAttribute(HTMLAttributes::width(), excCode);
       }
   
       HTMLGenericFormElementImpl::attach();
  @@ -1955,13 +1899,13 @@
       // http://www.w3.org/TR/1998/REC-html40-19980424/appendix/notes.html#altgen
       // also heavily discussed by Hixie on bugzilla
       // note this is intentionally different to HTMLImageElementImpl::altText()
  -    DOMString alt = getAttribute( ATTR_ALT );
  +    DOMString alt = getAttribute(HTMLAttributes::alt());
       // fall back to title attribute
  -    if ( alt.isNull() )
  -        alt = getAttribute( ATTR_TITLE );
  -    if ( alt.isNull() )
  -        alt = getAttribute( ATTR_VALUE );
  -    if ( alt.isEmpty() )
  +    if (alt.isNull())
  +        alt = getAttribute(HTMLAttributes::title());
  +    if (alt.isNull())
  +        alt = getAttribute(HTMLAttributes::value());
  +    if (alt.isEmpty())
   #if APPLE_CHANGES
           alt = inputElementAltText();
   #else
  @@ -2138,7 +2082,7 @@
       // because that would allow a malicious web page to upload files by setting the
       // value attribute in markup.
       if (value.isNull() && m_type != FILE)
  -        value = getAttribute(ATTR_VALUE);
  +        value = getAttribute(HTMLAttributes::value());
   
       // If no attribute exists, then just use "on" or "" based off the checked() state of the control.
       if (value.isNull() && (m_type == CHECKBOX || m_type == RADIO))
  @@ -2198,7 +2142,7 @@
               m_render->updateFromElement();
           setChanged();
       } else {
  -        setAttribute(ATTR_VALUE, value);
  +        setAttribute(HTMLAttributes::value(), value);
       }
   }
   
  @@ -2364,102 +2308,97 @@
   
   bool HTMLInputElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return (attr->id() == ATTR_SRC);
  +    return (attr->name() == HTMLAttributes::src());
   }
   
   DOMString HTMLInputElementImpl::defaultValue() const
   {
  -    return getAttribute(ATTR_VALUE);
  +    return getAttribute(HTMLAttributes::value());
   }
   
   void HTMLInputElementImpl::setDefaultValue(const DOMString &value)
   {
  -    setAttribute(ATTR_VALUE, value);
  +    setAttribute(HTMLAttributes::value(), value);
   }
   
   bool HTMLInputElementImpl::defaultChecked() const
   {
  -    return !getAttribute(ATTR_CHECKED).isNull();
  +    return !getAttribute(HTMLAttributes::checked()).isNull();
   }
   
   void HTMLInputElementImpl::setDefaultChecked(bool defaultChecked)
   {
  -    setAttribute(ATTR_CHECKED, defaultChecked ? "" : 0);
  +    setAttribute(HTMLAttributes::checked(), defaultChecked ? "" : 0);
   }
   
   DOMString HTMLInputElementImpl::accept() const
   {
  -    return getAttribute(ATTR_ACCEPT);
  +    return getAttribute(HTMLAttributes::accept());
   }
   
   void HTMLInputElementImpl::setAccept(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCEPT, value);
  +    setAttribute(HTMLAttributes::accept(), value);
   }
   
   DOMString HTMLInputElementImpl::accessKey() const
   {
  -    return getAttribute(ATTR_ACCESSKEY);
  +    return getAttribute(HTMLAttributes::accesskey());
   }
   
   void HTMLInputElementImpl::setAccessKey(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCESSKEY, value);
  +    setAttribute(HTMLAttributes::accesskey(), value);
   }
   
   DOMString HTMLInputElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLInputElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLInputElementImpl::alt() const
   {
  -    return getAttribute(ATTR_ALT);
  +    return getAttribute(HTMLAttributes::alt());
   }
   
   void HTMLInputElementImpl::setAlt(const DOMString &value)
   {
  -    setAttribute(ATTR_ALT, value);
  +    setAttribute(HTMLAttributes::alt(), value);
   }
   
   void HTMLInputElementImpl::setMaxLength(long _maxLength)
   {
  -    setAttribute(ATTR_MAXLENGTH, QString::number(_maxLength));
  -}
  -
  -DOMString HTMLInputElementImpl::sizeDOM() const
  -{
  -    return getAttribute(ATTR_SIZE);
  +    setAttribute(HTMLAttributes::maxlength(), QString::number(_maxLength));
   }
   
  -void HTMLInputElementImpl::setSize(const DOMString &value)
  +void HTMLInputElementImpl::setSize(unsigned long _size)
   {
  -    setAttribute(ATTR_SIZE, value);
  +    setAttribute(HTMLAttributes::size(), QString::number(_size));
   }
   
   DOMString HTMLInputElementImpl::src() const
   {
  -    return getDocument()->completeURL(getAttribute(ATTR_SRC));
  +    return getDocument()->completeURL(getAttribute(HTMLAttributes::src()));
   }
   
   void HTMLInputElementImpl::setSrc(const DOMString &value)
   {
  -    setAttribute(ATTR_SRC, value);
  +    setAttribute(HTMLAttributes::src(), value);
   }
   
   DOMString HTMLInputElementImpl::useMap() const
   {
  -    return getAttribute(ATTR_USEMAP);
  +    return getAttribute(HTMLAttributes::usemap());
   }
   
   void HTMLInputElementImpl::setUseMap(const DOMString &value)
   {
  -    setAttribute(ATTR_USEMAP, value);
  +    setAttribute(HTMLAttributes::usemap(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -2480,24 +2419,19 @@
   
   void HTMLLabelElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_ONFOCUS:
  +    if (attr->name() == HTMLAttributes::onfocus()) {
           setHTMLEventListener(EventImpl::FOCUS_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONBLUR:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onblur()) {
           setHTMLEventListener(EventImpl::BLUR_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    default:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   ElementImpl *HTMLLabelElementImpl::formElement()
   {
  -    DOMString formElementId = getAttribute(ATTR_FOR);
  +    DOMString formElementId = getAttribute(HTMLAttributes::forAttr());
       if (formElementId.isNull()) {
           // Search children of the label element for a form element.
           NodeImpl *node = this;
  @@ -2540,22 +2474,22 @@
   
   DOMString HTMLLabelElementImpl::accessKey() const
   {
  -    return getAttribute(ATTR_ACCESSKEY);
  +    return getAttribute(HTMLAttributes::accesskey());
   }
   
   void HTMLLabelElementImpl::setAccessKey(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCESSKEY, value);
  +    setAttribute(HTMLAttributes::accesskey(), value);
   }
   
   DOMString HTMLLabelElementImpl::htmlFor() const
   {
  -    return getAttribute(ATTR_FOR);
  +    return getAttribute(HTMLAttributes::forAttr());
   }
   
   void HTMLLabelElementImpl::setHtmlFor(const DOMString &value)
   {
  -    setAttribute(ATTR_FOR, value);
  +    setAttribute(HTMLAttributes::forAttr(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -2586,22 +2520,22 @@
   
   DOMString HTMLLegendElementImpl::accessKey() const
   {
  -    return getAttribute(ATTR_ACCESSKEY);
  +    return getAttribute(HTMLAttributes::accesskey());
   }
   
   void HTMLLegendElementImpl::setAccessKey(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCESSKEY, value);
  +    setAttribute(HTMLAttributes::accesskey(), value);
   }
   
   DOMString HTMLLegendElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLLegendElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   ElementImpl *HTMLLegendElementImpl::formElement()
  @@ -2897,35 +2831,25 @@
   
   void HTMLSelectElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_SIZE:
  -        m_size = kMax( attr->value().toInt(), 1 );
  -        break;
  -    case ATTR_WIDTH:
  +    if (attr->name() == HTMLAttributes::size()) {
  +        m_size = kMax(attr->value().toInt(), 1);
  +    } else if (attr->name() == HTMLAttributes::width()) {
           m_minwidth = kMax( attr->value().toInt(), 0 );
  -        break;
  -    case ATTR_MULTIPLE:
  +    } else if (attr->name() == HTMLAttributes::multiple()) {
           m_multiple = (!attr->isNull());
  -        break;
  -    case ATTR_ACCESSKEY:
  -        // ### ignore for the moment
  -        break;
  -    case ATTR_ONFOCUS:
  +    } else if (attr->name() == HTMLAttributes::accesskey()) {
  +        // FIXME: ignore for the moment
  +    } else if (attr->name() == HTMLAttributes::onfocus()) {
           setHTMLEventListener(EventImpl::FOCUS_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONBLUR:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onblur()) {
           setHTMLEventListener(EventImpl::BLUR_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONCHANGE:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onchange()) {
           setHTMLEventListener(EventImpl::CHANGE_EVENT,
  -            getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    default:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else
           HTMLGenericFormElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   RenderObject *HTMLSelectElementImpl::createRenderer(RenderArena *arena, RenderStyle *style)
  @@ -3069,7 +2993,7 @@
       for (i = 0; i < items.size(); i++) {
           if (items[i]->hasLocalName(HTMLNames::option())) {
               HTMLOptionElementImpl *option = static_cast<HTMLOptionElementImpl*>(items[i]);
  -            bool selected = (!option->getAttribute(ATTR_SELECTED).isNull());
  +            bool selected = (!option->getAttribute(HTMLAttributes::selected()).isNull());
               option->setSelected(selected);
           }
       }
  @@ -3121,12 +3045,12 @@
   
   void HTMLSelectElementImpl::setMultiple(bool multiple)
   {
  -    setAttribute(ATTR_MULTIPLE, multiple ? "" : 0);
  +    setAttribute(HTMLAttributes::multiple(), multiple ? "" : 0);
   }
   
   void HTMLSelectElementImpl::setSize(long size)
   {
  -    setAttribute(ATTR_SIZE, QString::number(size));
  +    setAttribute(HTMLAttributes::size(), QString::number(size));
   }
   
   // -------------------------------------------------------------------------
  @@ -3149,18 +3073,13 @@
   
   void HTMLKeygenElementImpl::parseMappedAttribute(MappedAttributeImpl* attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_CHALLENGE:
  +    if (attr->name() == HTMLAttributes::challenge())
           m_challenge = attr->value();
  -        break;
  -    case ATTR_KEYTYPE:
  +    else if (attr->name() == HTMLAttributes::keytype())
           m_keyType = attr->value();
  -        break;
  -    default:
  +    else
           // skip HTMLSelectElementImpl parsing!
           HTMLGenericFormElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   bool HTMLKeygenElementImpl::appendFormData(FormDataList& encoded_values, bool)
  @@ -3270,12 +3189,12 @@
   
   DOMString HTMLOptGroupElementImpl::label() const
   {
  -    return getAttribute(ATTR_LABEL);
  +    return getAttribute(HTMLAttributes::label());
   }
   
   void HTMLOptGroupElementImpl::setLabel(const DOMString &value)
   {
  -    setAttribute(ATTR_LABEL, value);
  +    setAttribute(HTMLAttributes::label(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -3302,7 +3221,7 @@
   
       // WinIE does not use the label attribute, so as a quirk, we ignore it.
       if (getDocument() && !getDocument()->inCompatMode()) {
  -        DOMString text = getAttribute(ATTR_LABEL);
  +        DOMString text = getAttribute(HTMLAttributes::label());
           if (!text.isEmpty())
               return text;
       }
  @@ -3356,17 +3275,12 @@
   
   void HTMLOptionElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_SELECTED:
  +    if (attr->name() == HTMLAttributes::selected())
           m_selected = (!attr->isNull());
  -        break;
  -    case ATTR_VALUE:
  +    else if (attr->name() == HTMLAttributes::value())
           m_value = attr->value();
  -        break;
  -    default:
  +    else
           HTMLGenericFormElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   DOMString HTMLOptionElementImpl::value() const
  @@ -3379,7 +3293,7 @@
   
   void HTMLOptionElementImpl::setValue(const DOMString &value)
   {
  -    setAttribute(ATTR_VALUE, value);
  +    setAttribute(HTMLAttributes::value(), value);
   }
   
   void HTMLOptionElementImpl::setSelected(bool _selected)
  @@ -3409,22 +3323,22 @@
   
   bool HTMLOptionElementImpl::defaultSelected() const
   {
  -    return !getAttribute(ATTR_SELECTED).isNull();
  +    return !getAttribute(HTMLAttributes::selected()).isNull();
   }
   
   void HTMLOptionElementImpl::setDefaultSelected(bool b)
   {
  -    setAttribute(ATTR_SELECTED, b ? "" : 0);
  +    setAttribute(HTMLAttributes::selected(), b ? "" : 0);
   }
   
   DOMString HTMLOptionElementImpl::label() const
   {
  -    return getAttribute(ATTR_LABEL);
  +    return getAttribute(HTMLAttributes::label());
   }
   
   void HTMLOptionElementImpl::setLabel(const DOMString &value)
   {
  -    setAttribute(ATTR_LABEL, value);
  +    setAttribute(HTMLAttributes::label(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -3507,19 +3421,15 @@
       
   void HTMLTextAreaElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_ROWS:
  +    if (attr->name() == HTMLAttributes::rows()) {
           m_rows = !attr->isNull() ? attr->value().toInt() : 3;
           if (renderer())
               renderer()->setNeedsLayoutAndMinMaxRecalc();
  -        break;
  -    case ATTR_COLS:
  +    } else if (attr->name() == HTMLAttributes::cols()) {
           m_cols = !attr->isNull() ? attr->value().toInt() : 60;
           if (renderer())
               renderer()->setNeedsLayoutAndMinMaxRecalc();
  -        break;
  -    case ATTR_WRAP:
  +    } else if (attr->name() == HTMLAttributes::wrap()) {
           // virtual / physical is Netscape extension of HTML 3.0, now deprecated
           // soft/ hard / off is recommendation for HTML 4 extension by IE and NS 4
           if ( strcasecmp( attr->value(), "virtual" ) == 0  || strcasecmp( attr->value(), "soft") == 0)
  @@ -3532,29 +3442,22 @@
               m_wrap = ta_NoWrap;
           if (renderer())
               renderer()->setNeedsLayoutAndMinMaxRecalc();
  -        break;
  -    case ATTR_ACCESSKEY:
  +    } else if (attr->name() == HTMLAttributes::accesskey()) {
           // ignore for the moment
  -        break;
  -    case ATTR_ONFOCUS:
  +    } else if (attr->name() == HTMLAttributes::onfocus()) {
           setHTMLEventListener(EventImpl::FOCUS_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONBLUR:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onblur()) {
           setHTMLEventListener(EventImpl::BLUR_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONSELECT:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onselect()) {
           setHTMLEventListener(EventImpl::SELECT_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONCHANGE:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onchange()) {
           setHTMLEventListener(EventImpl::CHANGE_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    default:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else
           HTMLGenericFormElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   RenderObject *HTMLTextAreaElementImpl::createRenderer(RenderArena *arena, RenderStyle *style)
  @@ -3671,22 +3574,22 @@
   
   DOMString HTMLTextAreaElementImpl::accessKey() const
   {
  -    return getAttribute(ATTR_ACCESSKEY);
  +    return getAttribute(HTMLAttributes::accesskey());
   }
   
   void HTMLTextAreaElementImpl::setAccessKey(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCESSKEY, value);
  +    setAttribute(HTMLAttributes::accesskey(), value);
   }
   
   void HTMLTextAreaElementImpl::setCols(long cols)
   {
  -    setAttribute(ATTR_COLS, QString::number(cols));
  +    setAttribute(HTMLAttributes::cols(), QString::number(cols));
   }
   
   void HTMLTextAreaElementImpl::setRows(long rows)
   {
  -    setAttribute(ATTR_ROWS, QString::number(rows));
  +    setAttribute(HTMLAttributes::rows(), QString::number(rows));
   }
   
   // -------------------------------------------------------------------------
  @@ -3700,25 +3603,22 @@
   
   void HTMLIsIndexElementImpl::parseMappedAttribute(MappedAttributeImpl* attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_PROMPT:
  +    if (attr->name() == HTMLAttributes::prompt())
   	setValue(attr->value());
  -    default:
  +    else
           // don't call HTMLInputElement::parseMappedAttribute here, as it would
           // accept attributes this element does not support
           HTMLGenericFormElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   DOMString HTMLIsIndexElementImpl::prompt() const
   {
  -    return getAttribute(ATTR_PROMPT);
  +    return getAttribute(HTMLAttributes::prompt());
   }
   
   void HTMLIsIndexElementImpl::setPrompt(const DOMString &value)
   {
  -    setAttribute(ATTR_PROMPT, value);
  +    setAttribute(HTMLAttributes::prompt(), value);
   }
   
   // -------------------------------------------------------------------------
  
  
  
  1.77      +2 -3      WebCore/khtml/html/html_formimpl.h
  
  Index: html_formimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.h,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- html_formimpl.h	9 Jul 2005 20:19:10 -0000	1.76
  +++ html_formimpl.h	18 Jul 2005 21:44:20 -0000	1.77
  @@ -375,7 +375,7 @@
       virtual void click(bool sendMouseEvents = false);
       virtual void accessKeyAction(bool sendToAnyElement);
   
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       virtual void attach();
  @@ -422,8 +422,7 @@
       DOMString alt() const;
       void setAlt(const DOMString &);
   
  -    DOMString sizeDOM() const; // FIXME: rename to size after renaming existing size attribute
  -    void setSize(const DOMString &);
  +    void setSize(unsigned long);
   
       DOMString src() const;
       void setSrc(const DOMString &);
  
  
  
  1.52      +65 -89    WebCore/khtml/html/html_headimpl.cpp
  
  Index: html_headimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_headimpl.cpp,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- html_headimpl.cpp	9 Jul 2005 20:19:10 -0000	1.51
  +++ html_headimpl.cpp	18 Jul 2005 21:44:20 -0000	1.52
  @@ -31,7 +31,6 @@
   #include "khtml_part.h"
   #include "kjs_proxy.h"
   
  -#include "misc/htmlhashes.h"
   #include "misc/loader.h"
   #include "misc/helper.h"
   
  @@ -56,19 +55,14 @@
   
   void HTMLBaseElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_HREF:
  +    if (attr->name() == HTMLAttributes::href()) {
   	m_href = khtml::parseURL(attr->value());
   	process();
  -	break;
  -    case ATTR_TARGET:
  -	m_target = attr->value();
  +    } else if (attr->name() == HTMLAttributes::target()) {
  +    	m_target = attr->value();
   	process();
  -	break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLBaseElementImpl::insertedIntoDocument()
  @@ -103,12 +97,12 @@
   
   void HTMLBaseElementImpl::setHref(const DOMString &value)
   {
  -    setAttribute(ATTR_HREF, value);
  +    setAttribute(HTMLAttributes::href(), value);
   }
   
   void HTMLBaseElementImpl::setTarget(const DOMString &value)
   {
  -    setAttribute(ATTR_TARGET, value);
  +    setAttribute(HTMLAttributes::target(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -169,30 +163,22 @@
   
   void HTMLLinkElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id())
  -    {
  -    case ATTR_REL:
  +    if (attr->name() == HTMLAttributes::rel()) {
           tokenizeRelAttribute(attr->value());
           process();
  -        break;
  -    case ATTR_HREF:
  +    } else if (attr->name() == HTMLAttributes::href()) {
           m_url = getDocument()->completeURL( khtml::parseURL(attr->value()).string() );
   	process();
  -        break;
  -    case ATTR_TYPE:
  +    } else if (attr->name() == HTMLAttributes::type()) {
           m_type = attr->value();
   	process();
  -        break;
  -    case ATTR_MEDIA:
  +    } else if (attr->name() == HTMLAttributes::media()) {
           m_media = attr->value().string().lower();
           process();
  -        break;
  -    case ATTR_DISABLED:
  +    } else if (attr->name() == HTMLAttributes::disabled()) {
           setDisabledState(!attr->isNull());
  -        break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLLinkElementImpl::tokenizeRelAttribute(const AtomicString& relStr)
  @@ -251,7 +237,7 @@
               if (!isAlternate())
                   getDocument()->addPendingSheet();
               
  -            QString chset = getAttribute( ATTR_CHARSET ).string();
  +            QString chset = getAttribute(HTMLAttributes::charset()).string();
               if (m_cachedSheet)
                   m_cachedSheet->deref(this);
               m_cachedSheet = getDocument()->docLoader()->requestStyleSheet(m_url, chset);
  @@ -318,97 +304,97 @@
   
   bool HTMLLinkElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_HREF;
  +    return attr->name() == HTMLAttributes::href();
   }
   
   bool HTMLLinkElementImpl::disabled() const
   {
  -    return !getAttribute(ATTR_DISABLED).isNull();
  +    return !getAttribute(HTMLAttributes::disabled()).isNull();
   }
   
   void HTMLLinkElementImpl::setDisabled(bool disabled)
   {
  -    setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    setAttribute(HTMLAttributes::disabled(), disabled ? "" : 0);
   }
   
   DOMString HTMLLinkElementImpl::charset() const
   {
  -    return getAttribute(ATTR_CHARSET);
  +    return getAttribute(HTMLAttributes::charset());
   }
   
   void HTMLLinkElementImpl::setCharset(const DOMString &value)
   {
  -    setAttribute(ATTR_CHARSET, value);
  +    setAttribute(HTMLAttributes::charset(), value);
   }
   
   DOMString HTMLLinkElementImpl::href() const
   {
  -    return getDocument()->completeURL(getAttribute(ATTR_HREF));
  +    return getDocument()->completeURL(getAttribute(HTMLAttributes::href()));
   }
   
   void HTMLLinkElementImpl::setHref(const DOMString &value)
   {
  -    setAttribute(ATTR_HREF, value);
  +    setAttribute(HTMLAttributes::href(), value);
   }
   
   DOMString HTMLLinkElementImpl::hreflang() const
   {
  -    return getAttribute(ATTR_HREFLANG);
  +    return getAttribute(HTMLAttributes::hreflang());
   }
   
   void HTMLLinkElementImpl::setHreflang(const DOMString &value)
   {
  -    setAttribute(ATTR_HREFLANG, value);
  +    setAttribute(HTMLAttributes::hreflang(), value);
   }
   
   DOMString HTMLLinkElementImpl::media() const
   {
  -    return getAttribute(ATTR_MEDIA);
  +    return getAttribute(HTMLAttributes::media());
   }
   
   void HTMLLinkElementImpl::setMedia(const DOMString &value)
   {
  -    setAttribute(ATTR_MEDIA, value);
  +    setAttribute(HTMLAttributes::media(), value);
   }
   
   DOMString HTMLLinkElementImpl::rel() const
   {
  -    return getAttribute(ATTR_REL);
  +    return getAttribute(HTMLAttributes::rel());
   }
   
   void HTMLLinkElementImpl::setRel(const DOMString &value)
   {
  -    setAttribute(ATTR_REL, value);
  +    setAttribute(HTMLAttributes::rel(), value);
   }
   
   DOMString HTMLLinkElementImpl::rev() const
   {
  -    return getAttribute(ATTR_REV);
  +    return getAttribute(HTMLAttributes::rev());
   }
   
   void HTMLLinkElementImpl::setRev(const DOMString &value)
   {
  -    setAttribute(ATTR_REV, value);
  +    setAttribute(HTMLAttributes::rev(), value);
   }
   
   DOMString HTMLLinkElementImpl::target() const
   {
  -    return getAttribute(ATTR_TARGET);
  +    return getAttribute(HTMLAttributes::target());
   }
   
   void HTMLLinkElementImpl::setTarget(const DOMString &value)
   {
  -    setAttribute(ATTR_TARGET, value);
  +    setAttribute(HTMLAttributes::target(), value);
   }
   
   DOMString HTMLLinkElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLLinkElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -423,21 +409,16 @@
   
   void HTMLMetaElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_HTTP_EQUIV:
  +    if (attr->name() == HTMLAttributes::http_equiv()) {
   	m_equiv = attr->value();
   	process();
  -	break;
  -    case ATTR_CONTENT:
  +    } else if (attr->name() == HTMLAttributes::content()) {
   	m_content = attr->value();
   	process();
  -	break;
  -    case ATTR_NAME:
  -      break;
  -    default:
  +    } else if (attr->name() == HTMLAttributes::name()) {
  +        // Do nothing.
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLMetaElementImpl::insertedIntoDocument()
  @@ -456,42 +437,42 @@
   
   DOMString HTMLMetaElementImpl::content() const
   {
  -    return getAttribute(ATTR_CONTENT);
  +    return getAttribute(HTMLAttributes::content());
   }
   
   void HTMLMetaElementImpl::setContent(const DOMString &value)
   {
  -    setAttribute(ATTR_CONTENT, value);
  +    setAttribute(HTMLAttributes::content(), value);
   }
   
   DOMString HTMLMetaElementImpl::httpEquiv() const
   {
  -    return getAttribute(ATTR_HTTP_EQUIV);
  +    return getAttribute(HTMLAttributes::http_equiv());
   }
   
   void HTMLMetaElementImpl::setHttpEquiv(const DOMString &value)
   {
  -    setAttribute(ATTR_HTTP_EQUIV, value);
  +    setAttribute(HTMLAttributes::http_equiv(), value);
   }
   
   DOMString HTMLMetaElementImpl::name() const
   {
  -    return getAttribute(ATTR_NAME);
  +    return getAttribute(HTMLAttributes::name());
   }
   
   void HTMLMetaElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   DOMString HTMLMetaElementImpl::scheme() const
   {
  -    return getAttribute(ATTR_SCHEME);
  +    return getAttribute(HTMLAttributes::scheme());
   }
   
   void HTMLMetaElementImpl::setScheme(const DOMString &value)
   {
  -    setAttribute(ATTR_SCHEME, value);
  +    setAttribute(HTMLAttributes::scheme(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -509,7 +490,7 @@
   
   bool HTMLScriptElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_SRC;
  +    return attr->name() == HTMLAttributes::src();
   }
   
   void HTMLScriptElementImpl::childrenChanged()
  @@ -530,9 +511,9 @@
       if (m_createdByParser)
           return;
       
  -    QString url = getAttribute(ATTR_SRC).string();
  +    QString url = getAttribute(HTMLAttributes::src()).string();
       if (!url.isEmpty()) {
  -        QString charset = getAttribute(ATTR_CHARSET).string();
  +        QString charset = getAttribute(HTMLAttributes::charset()).string();
           m_cachedScript = getDocument()->docLoader()->requestScript(DOMString(url), charset);
           m_cachedScript->ref(this);
           return;
  @@ -637,42 +618,42 @@
   
   DOMString HTMLScriptElementImpl::charset() const
   {
  -    return getAttribute(ATTR_CHARSET);
  +    return getAttribute(HTMLAttributes::charset());
   }
   
   void HTMLScriptElementImpl::setCharset(const DOMString &value)
   {
  -    setAttribute(ATTR_CHARSET, value);
  +    setAttribute(HTMLAttributes::charset(), value);
   }
   
   bool HTMLScriptElementImpl::defer() const
   {
  -    return !getAttribute(ATTR_DEFER).isNull();
  +    return !getAttribute(HTMLAttributes::defer()).isNull();
   }
   
   void HTMLScriptElementImpl::setDefer(bool defer)
   {
  -    setAttribute(ATTR_DEFER, defer ? "" : 0);
  +    setAttribute(HTMLAttributes::defer(), defer ? "" : 0);
   }
   
   DOMString HTMLScriptElementImpl::src() const
   {
  -    return getDocument()->completeURL(getAttribute(ATTR_SRC));
  +    return getDocument()->completeURL(getAttribute(HTMLAttributes::src()));
   }
   
   void HTMLScriptElementImpl::setSrc(const DOMString &value)
   {
  -    setAttribute(ATTR_SRC, value);
  +    setAttribute(HTMLAttributes::src(), value);
   }
   
   DOMString HTMLScriptElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLScriptElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -691,17 +672,12 @@
   // other stuff...
   void HTMLStyleElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id())
  -    {
  -    case ATTR_TYPE:
  +    if (attr->name() == HTMLAttributes::type())
           m_type = attr->value().domString().lower();
  -        break;
  -    case ATTR_MEDIA:
  +    else if (attr->name() == HTMLAttributes::media())
           m_media = attr->value().string().lower();
  -        break;
  -    default:
  +    else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLStyleElementImpl::insertedIntoDocument()
  @@ -768,32 +744,32 @@
   
   bool HTMLStyleElementImpl::disabled() const
   {
  -    return !getAttribute(ATTR_DISABLED).isNull();
  +    return !getAttribute(HTMLAttributes::disabled()).isNull();
   }
   
   void HTMLStyleElementImpl::setDisabled(bool disabled)
   {
  -    setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    setAttribute(HTMLAttributes::disabled(), disabled ? "" : 0);
   }
   
   DOMString HTMLStyleElementImpl::media() const
   {
  -    return getAttribute(ATTR_MEDIA);
  +    return getAttribute(HTMLAttributes::media());
   }
   
   void HTMLStyleElementImpl::setMedia(const DOMString &value)
   {
  -    setAttribute(ATTR_MEDIA, value);
  +    setAttribute(HTMLAttributes::media(), value);
   }
   
   DOMString HTMLStyleElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLStyleElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   // -------------------------------------------------------------------------
  
  
  
  1.45      +118 -163  WebCore/khtml/html/html_imageimpl.cpp
  
  Index: html_imageimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.cpp,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- html_imageimpl.cpp	9 Jul 2005 20:19:10 -0000	1.44
  +++ html_imageimpl.cpp	18 Jul 2005 21:44:20 -0000	1.45
  @@ -25,7 +25,6 @@
   #include "html/html_formimpl.h"
   #include "html/html_documentimpl.h"
   
  -#include "misc/htmlhashes.h"
   #include "khtmlview.h"
   #include "khtml_part.h"
   
  @@ -76,9 +75,9 @@
   
       AtomicString attr;
       if (element()->hasLocalName(HTMLNames::object()))
  -        attr = element()->getAttribute(ATTR_DATA);
  +        attr = element()->getAttribute(HTMLAttributes::data());
       else
  -        attr = element()->getAttribute(ATTR_SRC);
  +        attr = element()->getAttribute(HTMLAttributes::src());
       
       // Treat a lack of src or empty string for src as no image at all.
       CachedImage* newImage = 0;
  @@ -154,45 +153,37 @@
           m_form->removeImgElement(this);
   }
   
  -bool HTMLImageElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLImageElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch(attr)
  -    {
  -        case ATTR_WIDTH:
  -        case ATTR_HEIGHT:
  -        case ATTR_VSPACE:
  -        case ATTR_HSPACE:
  -        case ATTR_VALIGN:
  -            result = eUniversal;
  -            return false;
  -        case ATTR_BORDER:
  -        case ATTR_ALIGN:
  -            result = eReplaced; // Shared with embeds and iframes
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::height() ||
  +        attrName == HTMLAttributes::vspace() ||
  +        attrName == HTMLAttributes::hspace() ||
  +        attrName == HTMLAttributes::valign()) {
  +        result = eUniversal;
  +        return false;
  +    }
  +    
  +    if (attrName == HTMLAttributes::border() ||
  +        attrName == HTMLAttributes::align()) {
  +        result = eReplaced; // Shared with embeds and iframes
  +        return false;
       }
   
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLImageElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id())
  -    {
  -    case ATTR_ALT:
  +    if (attr->name() == HTMLAttributes::alt()) {
           if (m_render) static_cast<RenderImage*>(m_render)->updateAltText();
  -        break;
  -    case ATTR_SRC:
  +    } else if (attr->name() == HTMLAttributes::src()) {
           m_imageLoader.updateFromElement();
  -        break;
  -    case ATTR_WIDTH:
  +    } else if (attr->name() == HTMLAttributes::width()) {
           addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  -        break;
  -    case ATTR_HEIGHT:
  +    } else if (attr->name() == HTMLAttributes::height()) {
           addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
  -        break;
  -    case ATTR_BORDER:
  +    } else if (attr->name() == HTMLAttributes::border()) {
           // border="noborder" -> border="0"
           if(attr->value().toInt()) {
               addCSSLength(attr, CSS_PROP_BORDER_WIDTH, attr->value());
  @@ -201,78 +192,62 @@
               addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID);
               addCSSProperty(attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID);
           }
  -        break;
  -    case ATTR_VSPACE:
  +    } else if (attr->name() == HTMLAttributes::vspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  -        break;
  -    case ATTR_HSPACE:
  +    } else if (attr->name() == HTMLAttributes::hspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  -        break;
  -    case ATTR_ALIGN:
  +    } else if (attr->name() == HTMLAttributes::align()) {
           addHTMLAlignment(attr);
  -	break;
  -    case ATTR_VALIGN:
  +    } else if (attr->name() == HTMLAttributes::valign()) {
           addCSSProperty(attr, CSS_PROP_VERTICAL_ALIGN, attr->value());
  -        break;
  -    case ATTR_USEMAP:
  -        if ( attr->value().domString()[0] == '#' )
  +    } else if (attr->name() == HTMLAttributes::usemap()) {
  +        if (attr->value().domString()[0] == '#')
               usemap = attr->value();
           else {
  -            QString url = getDocument()->completeURL( khtml::parseURL( attr->value() ).string() );
  +            QString url = getDocument()->completeURL(khtml::parseURL(attr->value()).string());
               // ### we remove the part before the anchor and hope
               // the map is on the same html page....
               usemap = url;
           }
           m_isLink = !attr->isNull();
  -    case ATTR_ISMAP:
  +    } else if (attr->name() == HTMLAttributes::ismap()) {
           ismap = true;
  -        break;
  -    case ATTR_ONABORT: // ### add support for this
  +    } else if (attr->name() == HTMLAttributes::onabort()) {
           setHTMLEventListener(EventImpl::ABORT_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONERROR:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onerror()) {
           setHTMLEventListener(EventImpl::ERROR_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONLOAD:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onload()) {
           setHTMLEventListener(EventImpl::LOAD_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_NOSAVE:
  -	break;
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    }
   #if APPLE_CHANGES
  -    case ATTR_COMPOSITE:
  +    else if (attr->name() == HTMLAttributes::composite())
           _compositeOperator = attr->value().string();
  -        break;
   #endif
  -    case ATTR_NAME:
  -	{
  -	    QString newNameAttr = attr->value().string();
  -	    if (attached() && getDocument()->isHTMLDocument()) {
  -		HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
  -		document->removeNamedImageOrForm(oldNameAttr);
  -		document->addNamedImageOrForm(newNameAttr);
  -	    }
  -	    oldNameAttr = newNameAttr;
  -	}
  -	break;
  -    case ATTR_ID:
  -	{
  -	    QString newIdAttr = attr->value().string();
  -	    if (attached() && getDocument()->isHTMLDocument()) {
  -		HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
  -		document->removeNamedImageOrForm(oldIdAttr);
  -		document->addNamedImageOrForm(newIdAttr);
  -	    }
  -	    oldIdAttr = newIdAttr;
  -	}
  -	// fall through
  -    default:
  -        HTMLElementImpl::parseMappedAttribute(attr);
  +    else if (attr->name() == HTMLAttributes::name()) {
  +        QString newNameAttr = attr->value().string();
  +        if (attached() && getDocument()->isHTMLDocument()) {
  +            HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
  +            document->removeNamedImageOrForm(oldNameAttr);
  +            document->addNamedImageOrForm(newNameAttr);
  +        }
  +        oldNameAttr = newNameAttr;
       }
  +    else if (attr->name() == HTMLAttributes::idAttr()) {
  +        QString newIdAttr = attr->value().string();
  +        if (attached() && getDocument()->isHTMLDocument()) {
  +            HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
  +            document->removeNamedImageOrForm(oldIdAttr);
  +            document->addNamedImageOrForm(newIdAttr);
  +        }
  +        oldIdAttr = newIdAttr;
  +        HTMLElementImpl::parseMappedAttribute(attr);
  +    } else
  +        HTMLElementImpl::parseMappedAttribute(attr);
   }
   
   DOMString HTMLImageElementImpl::altText() const
  @@ -280,20 +255,10 @@
       // lets figure out the alt text.. magic stuff
       // http://www.w3.org/TR/1998/REC-html40-19980424/appendix/notes.html#altgen
       // also heavily discussed by Hixie on bugzilla
  -    DOMString alt( getAttribute( ATTR_ALT ) );
  +    DOMString alt(getAttribute(HTMLAttributes::alt()));
       // fall back to title attribute
  -    if ( alt.isNull() )
  -        alt = getAttribute( ATTR_TITLE );
  -#if 0
  -    if ( alt.isNull() ) {
  -        QString p = KURL( getDocument()->completeURL( getAttribute(ATTR_SRC).string() ) ).prettyURL();
  -        int pos;
  -        if ( ( pos = p.findRev( '.' ) ) > 0 )
  -            p.truncate( pos );
  -        alt = DOMString( KStringHandler::csqueeze( p ) );
  -    }
  -#endif
  -
  +    if (alt.isNull())
  +        alt = getAttribute(HTMLAttributes::title());
       return alt;
   }
   
  @@ -333,7 +298,7 @@
   {
       if (!m_render) {
   	// check the attribute first for an explicit pixel value
  -	DOM::DOMString attrWidth = getAttribute(ATTR_WIDTH);
  +	DOM::DOMString attrWidth = getAttribute(HTMLAttributes::width());
   	bool ok;
   	long width = attrWidth.string().toLong(&ok);
   	if (ok) {
  @@ -360,7 +325,7 @@
   {
       if (!m_render) {
   	// check the attribute first for an explicit pixel value
  -	DOM::DOMString attrHeight = getAttribute(ATTR_HEIGHT);
  +	DOM::DOMString attrHeight = getAttribute(HTMLAttributes::height());
   	bool ok;
   	long height = attrHeight.string().toLong(&ok);
   	if (ok) {
  @@ -393,120 +358,120 @@
   
   bool HTMLImageElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return (attr->id() == ATTR_SRC || (attr->id() == ATTR_USEMAP && attr->value().domString()[0] != '#'));
  +    return (attr->name() == HTMLAttributes::src() || (attr->name() == HTMLAttributes::usemap() && attr->value().domString()[0] != '#'));
   }
   
   DOMString HTMLImageElementImpl::name() const
   {
  -    return getAttribute(ATTR_NAME);
  +    return getAttribute(HTMLAttributes::name());
   }
   
   void HTMLImageElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   DOMString HTMLImageElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLImageElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLImageElementImpl::alt() const
   {
  -    return getAttribute(ATTR_ALT);
  +    return getAttribute(HTMLAttributes::alt());
   }
   
   void HTMLImageElementImpl::setAlt(const DOMString &value)
   {
  -    setAttribute(ATTR_ALT, value);
  +    setAttribute(HTMLAttributes::alt(), value);
   }
   
   long HTMLImageElementImpl::border() const
   {
       // ### return value in pixels
  -    return getAttribute(ATTR_BORDER).toInt();
  +    return getAttribute(HTMLAttributes::border()).toInt();
   }
   
   void HTMLImageElementImpl::setBorder(long value)
   {
  -    setAttribute(ATTR_BORDER, QString::number(value));
  +    setAttribute(HTMLAttributes::border(), QString::number(value));
   }
   
   void HTMLImageElementImpl::setHeight(long value)
   {
  -    setAttribute(ATTR_HEIGHT, QString::number(value));
  +    setAttribute(HTMLAttributes::height(), QString::number(value));
   }
   
   long HTMLImageElementImpl::hspace() const
   {
       // ### return actual value
  -    return getAttribute(ATTR_HSPACE).toInt();
  +    return getAttribute(HTMLAttributes::hspace()).toInt();
   }
   
   void HTMLImageElementImpl::setHspace(long value)
   {
  -    setAttribute(ATTR_HSPACE, QString::number(value));
  +    setAttribute(HTMLAttributes::hspace(), QString::number(value));
   }
   
   bool HTMLImageElementImpl::isMap() const
   {
  -    return !getAttribute(ATTR_ISMAP).isNull();
  +    return !getAttribute(HTMLAttributes::ismap()).isNull();
   }
   
   void HTMLImageElementImpl::setIsMap(bool isMap)
   {
  -    setAttribute(ATTR_ISMAP, isMap ? "" : 0);
  +    setAttribute(HTMLAttributes::ismap(), isMap ? "" : 0);
   }
   
   DOMString HTMLImageElementImpl::longDesc() const
   {
  -    return getAttribute(ATTR_LONGDESC);
  +    return getAttribute(HTMLAttributes::longdesc());
   }
   
   void HTMLImageElementImpl::setLongDesc(const DOMString &value)
   {
  -    setAttribute(ATTR_LONGDESC, value);
  +    setAttribute(HTMLAttributes::longdesc(), value);
   }
   
   DOMString HTMLImageElementImpl::src() const
   {
  -    return getDocument()->completeURL(getAttribute(ATTR_SRC));
  +    return getDocument()->completeURL(getAttribute(HTMLAttributes::src()));
   }
   
   void HTMLImageElementImpl::setSrc(const DOMString &value)
   {
  -    setAttribute(ATTR_SRC, value);
  +    setAttribute(HTMLAttributes::src(), value);
   }
   
   DOMString HTMLImageElementImpl::useMap() const
   {
  -    return getAttribute(ATTR_USEMAP);
  +    return getAttribute(HTMLAttributes::usemap());
   }
   
   void HTMLImageElementImpl::setUseMap(const DOMString &value)
   {
  -    setAttribute(ATTR_USEMAP, value);
  +    setAttribute(HTMLAttributes::usemap(), value);
   }
   
   long HTMLImageElementImpl::vspace() const
   {
       // ### return actual vspace
  -    return getAttribute(ATTR_VSPACE).toInt();
  +    return getAttribute(HTMLAttributes::vspace()).toInt();
   }
   
   void HTMLImageElementImpl::setVspace(long value)
   {
  -    setAttribute(ATTR_VSPACE, QString::number(value));
  +    setAttribute(HTMLAttributes::vspace(), QString::number(value));
   }
   
   void HTMLImageElementImpl::setWidth(long value)
   {
  -    setAttribute(ATTR_WIDTH, QString::number(value));
  +    setAttribute(HTMLAttributes::width(), QString::number(value));
   }
   
   long HTMLImageElementImpl::x() const
  @@ -587,23 +552,20 @@
   
   void HTMLMapElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id())
  -    {
  -    case ATTR_ID:
  -        // Must call base class so that hasID bit gets set.
  -        HTMLElementImpl::parseMappedAttribute(attr);
  -        if (getDocument()->htmlMode() != DocumentImpl::XHtml) break;
  -        // fall through
  -    case ATTR_NAME:
  +    if (attr->name() == HTMLAttributes::idAttr() || attr->name() == HTMLAttributes::name()) {
  +        if (attr->name() == HTMLAttributes::idAttr()) {
  +            // Must call base class so that hasID bit gets set.
  +            HTMLElementImpl::parseMappedAttribute(attr);
  +            if (getDocument()->htmlMode() != DocumentImpl::XHtml)
  +                return;
  +        }
           getDocument()->removeImageMap(this);
           m_name = attr->value();
           if (m_name.length() != 0 && m_name[0] == '#')
               m_name.remove(0, 1);
           getDocument()->addImageMap(this);
  -        break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   SharedPtr<HTMLCollectionImpl> HTMLMapElementImpl::areas()
  @@ -613,12 +575,12 @@
   
   DOMString HTMLMapElementImpl::name() const
   {
  -    return getAttribute(ATTR_NAME);
  +    return getAttribute(HTMLAttributes::name());
   }
   
   void HTMLMapElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -639,9 +601,7 @@
   
   void HTMLAreaElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id())
  -    {
  -    case ATTR_SHAPE:
  +    if (attr->name() == HTMLAttributes::shape()) {
           if ( strcasecmp( attr->value(), "default" ) == 0 )
               m_shape = Default;
           else if ( strcasecmp( attr->value(), "circle" ) == 0 )
  @@ -650,21 +610,16 @@
               m_shape = Poly;
           else if ( strcasecmp( attr->value(), "rect" ) == 0 )
               m_shape = Rect;
  -        break;
  -    case ATTR_COORDS:
  +    } else if (attr->name() == HTMLAttributes::coords()) {
           if (m_coords) delete [] m_coords;
           m_coords = attr->value().toCoordsArray(m_coordsLen);
  -        break;
  -    case ATTR_TARGET:
  +    } else if (attr->name() == HTMLAttributes::target()) {
           m_hasTarget = !attr->isNull();
  -        break;
  -    case ATTR_ALT:
  -        break;
  -    case ATTR_ACCESSKEY:
  -        break;
  -    default:
  +    } else if (attr->name() == HTMLAttributes::alt() ||
  +               attr->name() == HTMLAttributes::accesskey()) {
  +        // Do nothing
  +    } else
           HTMLAnchorElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   bool HTMLAreaElementImpl::mapMouseEvent(int x_, int y_, int width_, int height_,
  @@ -737,80 +692,80 @@
   
   DOMString HTMLAreaElementImpl::accessKey() const
   {
  -    return getAttribute(ATTR_ACCESSKEY);
  +    return getAttribute(HTMLAttributes::accesskey());
   }
   
   void HTMLAreaElementImpl::setAccessKey(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCESSKEY, value);
  +    setAttribute(HTMLAttributes::accesskey(), value);
   }
   
   DOMString HTMLAreaElementImpl::alt() const
   {
  -    return getAttribute(ATTR_ALT);
  +    return getAttribute(HTMLAttributes::alt());
   }
   
   void HTMLAreaElementImpl::setAlt(const DOMString &value)
   {
  -    setAttribute(ATTR_ALT, value);
  +    setAttribute(HTMLAttributes::alt(), value);
   }
   
   DOMString HTMLAreaElementImpl::coords() const
   {
  -    return getAttribute(ATTR_COORDS);
  +    return getAttribute(HTMLAttributes::coords());
   }
   
   void HTMLAreaElementImpl::setCoords(const DOMString &value)
   {
  -    setAttribute(ATTR_COORDS, value);
  +    setAttribute(HTMLAttributes::coords(), value);
   }
   
   DOMString HTMLAreaElementImpl::href() const
   {
  -    return getDocument()->completeURL(getAttribute(ATTR_HREF));
  +    return getDocument()->completeURL(getAttribute(HTMLAttributes::href()));
   }
   
   void HTMLAreaElementImpl::setHref(const DOMString &value)
   {
  -    setAttribute(ATTR_HREF, value);
  +    setAttribute(HTMLAttributes::href(), value);
   }
   
   bool HTMLAreaElementImpl::noHref() const
   {
  -    return !getAttribute(ATTR_NOHREF).isNull();
  +    return !getAttribute(HTMLAttributes::nohref()).isNull();
   }
   
   void HTMLAreaElementImpl::setNoHref(bool noHref)
   {
  -    setAttribute(ATTR_NOHREF, noHref ? "" : 0);
  +    setAttribute(HTMLAttributes::nohref(), noHref ? "" : 0);
   }
   
   DOMString HTMLAreaElementImpl::shape() const
   {
  -    return getAttribute(ATTR_SHAPE);
  +    return getAttribute(HTMLAttributes::shape());
   }
   
   void HTMLAreaElementImpl::setShape(const DOMString &value)
   {
  -    setAttribute(ATTR_SHAPE, value);
  +    setAttribute(HTMLAttributes::shape(), value);
   }
   
   long HTMLAreaElementImpl::tabIndex() const
   {
  -    return getAttribute(ATTR_TABINDEX).toInt();
  +    return getAttribute(HTMLAttributes::tabindex()).toInt();
   }
   
   void HTMLAreaElementImpl::setTabIndex(long tabIndex)
   {
  -    setAttribute(ATTR_TABINDEX, QString::number(tabIndex));
  +    setAttribute(HTMLAttributes::tabindex(), QString::number(tabIndex));
   }
   
   DOMString HTMLAreaElementImpl::target() const
   {
  -    return getAttribute(ATTR_TARGET);
  +    return getAttribute(HTMLAttributes::target());
   }
   
   void HTMLAreaElementImpl::setTarget(const DOMString &value)
   {
  -    setAttribute(ATTR_TARGET, value);
  +    setAttribute(HTMLAttributes::target(), value);
   }
  
  
  
  1.23      +1 -1      WebCore/khtml/html/html_imageimpl.h
  
  Index: html_imageimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- html_imageimpl.h	9 Jul 2005 20:19:10 -0000	1.22
  +++ html_imageimpl.h	18 Jul 2005 21:44:20 -0000	1.23
  @@ -81,7 +81,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; }
       virtual int tagPriority() const { return 0; }
   
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *);
   
       virtual void attach();
  
  
  
  1.44      +64 -88    WebCore/khtml/html/html_inlineimpl.cpp
  
  Index: html_inlineimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_inlineimpl.cpp,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- html_inlineimpl.cpp	9 Jul 2005 20:19:10 -0000	1.43
  +++ html_inlineimpl.cpp	18 Jul 2005 21:44:20 -0000	1.44
  @@ -27,7 +27,6 @@
   #include "html/html_imageimpl.h"
   #include "html/html_documentimpl.h"
   
  -#include "misc/htmlhashes.h"
   #include "khtmlview.h"
   #include "khtml_part.h"
   #include "css/csshelper.h"
  @@ -146,9 +145,9 @@
               }
           }
   
  -        url = khtml::parseURL(getAttribute(ATTR_HREF)).string();
  +        url = khtml::parseURL(getAttribute(HTMLAttributes::href())).string();
   
  -        utarget = getAttribute(ATTR_TARGET).string();
  +        utarget = getAttribute(HTMLAttributes::target()).string();
   
           if ( e && e->button() == 1 )
               utarget = "_blank";
  @@ -217,21 +216,16 @@
   
   void HTMLAnchorElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_HREF:
  +    if (attr->name() == HTMLAttributes::href()) {
           m_isLink = !attr->isNull();
  -        break;
  -    case ATTR_TARGET:
  +    } else if (attr->name() == HTMLAttributes::target()) {
           m_hasTarget = !attr->isNull();
  -        break;
  -    case ATTR_NAME:
  -    case ATTR_TITLE:
  -    case ATTR_REL:
  -	break;
  -    default:
  +    } else if (attr->name() == HTMLAttributes::name() ||
  +             attr->name() == HTMLAttributes::title() ||
  +             attr->name() == HTMLAttributes::rel()) {
  +        // Do nothing.
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLAnchorElementImpl::accessKeyAction(bool sendToAnyElement)
  @@ -243,42 +237,42 @@
   
   bool HTMLAnchorElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_HREF;
  +    return attr->name() == HTMLAttributes::href();
   }
   
   DOMString HTMLAnchorElementImpl::accessKey() const
   {
  -    return getAttribute(ATTR_ACCESSKEY);
  +    return getAttribute(HTMLAttributes::accesskey());
   }
   
   void HTMLAnchorElementImpl::setAccessKey(const DOMString &value)
   {
  -    setAttribute(ATTR_ACCESSKEY, value);
  +    setAttribute(HTMLAttributes::accesskey(), value);
   }
   
   DOMString HTMLAnchorElementImpl::charset() const
   {
  -    return getAttribute(ATTR_CHARSET);
  +    return getAttribute(HTMLAttributes::charset());
   }
   
   void HTMLAnchorElementImpl::setCharset(const DOMString &value)
   {
  -    setAttribute(ATTR_CHARSET, value);
  +    setAttribute(HTMLAttributes::charset(), value);
   }
   
   DOMString HTMLAnchorElementImpl::coords() const
   {
  -    return getAttribute(ATTR_COORDS);
  +    return getAttribute(HTMLAttributes::coords());
   }
   
   void HTMLAnchorElementImpl::setCoords(const DOMString &value)
   {
  -    setAttribute(ATTR_COORDS, value);
  +    setAttribute(HTMLAttributes::coords(), value);
   }
   
   DOMString HTMLAnchorElementImpl::href() const
   {
  -    DOMString href = getAttribute(ATTR_HREF);
  +    DOMString href = getAttribute(HTMLAttributes::href());
       if (href.isNull())
           return href;
       return getDocument()->completeURL(href);
  @@ -286,87 +280,87 @@
   
   void HTMLAnchorElementImpl::setHref(const DOMString &value)
   {
  -    setAttribute(ATTR_HREF, value);
  +    setAttribute(HTMLAttributes::href(), value);
   }
   
   DOMString HTMLAnchorElementImpl::hreflang() const
   {
  -    return getAttribute(ATTR_HREFLANG);
  +    return getAttribute(HTMLAttributes::hreflang());
   }
   
   void HTMLAnchorElementImpl::setHreflang(const DOMString &value)
   {
  -    setAttribute(ATTR_HREFLANG, value);
  +    setAttribute(HTMLAttributes::hreflang(), value);
   }
   
   DOMString HTMLAnchorElementImpl::name() const
   {
  -    return getAttribute(ATTR_NAME);
  +    return getAttribute(HTMLAttributes::name());
   }
   
   void HTMLAnchorElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   DOMString HTMLAnchorElementImpl::rel() const
   {
  -    return getAttribute(ATTR_REL);
  +    return getAttribute(HTMLAttributes::rel());
   }
   
   void HTMLAnchorElementImpl::setRel(const DOMString &value)
   {
  -    setAttribute(ATTR_REL, value);
  +    setAttribute(HTMLAttributes::rel(), value);
   }
   
   DOMString HTMLAnchorElementImpl::rev() const
   {
  -    return getAttribute(ATTR_REV);
  +    return getAttribute(HTMLAttributes::rev());
   }
   
   void HTMLAnchorElementImpl::setRev(const DOMString &value)
   {
  -    setAttribute(ATTR_REV, value);
  +    setAttribute(HTMLAttributes::rev(), value);
   }
   
   DOMString HTMLAnchorElementImpl::shape() const
   {
  -    return getAttribute(ATTR_SHAPE);
  +    return getAttribute(HTMLAttributes::shape());
   }
   
   void HTMLAnchorElementImpl::setShape(const DOMString &value)
   {
  -    setAttribute(ATTR_SHAPE, value);
  +    setAttribute(HTMLAttributes::shape(), value);
   }
   
   long HTMLAnchorElementImpl::tabIndex() const
   {
  -    return getAttribute(ATTR_TABINDEX).toInt();
  +    return getAttribute(HTMLAttributes::tabindex()).toInt();
   }
   
   void HTMLAnchorElementImpl::setTabIndex(long tabIndex)
   {
  -    setAttribute(ATTR_TABINDEX, QString::number(tabIndex));
  +    setAttribute(HTMLAttributes::tabindex(), QString::number(tabIndex));
   }
   
   DOMString HTMLAnchorElementImpl::target() const
   {
  -    return getAttribute(ATTR_TARGET);
  +    return getAttribute(HTMLAttributes::target());
   }
   
   void HTMLAnchorElementImpl::setTarget(const DOMString &value)
   {
  -    setAttribute(ATTR_TARGET, value);
  +    setAttribute(HTMLAttributes::target(), value);
   }
   
   DOMString HTMLAnchorElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLAnchorElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   void HTMLAnchorElementImpl::blur()
  @@ -391,22 +385,19 @@
   {
   }
   
  -bool HTMLBRElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLBRElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    if (attr == ATTR_CLEAR) {
  +    if (attrName == HTMLAttributes::clear()) {
           result = eUniversal;
           return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLBRElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id())
  -    {
  -    case ATTR_CLEAR:
  -    {
  +    if (attr->name() == HTMLAttributes::clear()) {
           DOMString str = attr->value();
           // If the string is empty, then don't add the clear property. 
           // <br clear> and <br clear=""> are just treated like <br> by Gecko,
  @@ -416,11 +407,8 @@
                   str = "both";
               addCSSProperty(attr, CSS_PROP_CLEAR, str);
           }
  -        break;
  -    }
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   RenderObject *HTMLBRElementImpl::createRenderer(RenderArena *arena, RenderStyle *style)
  @@ -430,12 +418,12 @@
   
   DOMString HTMLBRElementImpl::clear() const
   {
  -    return getAttribute(ATTR_CLEAR);
  +    return getAttribute(HTMLAttributes::clear());
   }
   
   void HTMLBRElementImpl::setClear(const DOMString &value)
   {
  -    setAttribute(ATTR_CLEAR, value);
  +    setAttribute(HTMLAttributes::clear(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -495,28 +483,21 @@
       return true;
   }
   
  -bool HTMLFontElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLFontElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch(attr)
  -    {
  -        case ATTR_SIZE:
  -        case ATTR_COLOR:
  -        case ATTR_FACE:
  -            result = eUniversal;
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::size() ||
  +        attrName == HTMLAttributes::color() ||
  +        attrName == HTMLAttributes::face()) {
  +        result = eUniversal;
  +        return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLFontElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_SIZE:
  -    {
  +    if (attr->name() == HTMLAttributes::size()) {
           int num;
           if (parseFontSizeNumber(attr->value(), num)) {
               int size;
  @@ -536,47 +517,42 @@
               }
               addCSSProperty(attr, CSS_PROP_FONT_SIZE, size);
           }
  -        break;
  -    }
  -    case ATTR_COLOR:
  +    } else if (attr->name() == HTMLAttributes::color()) {
           addCSSColor(attr, CSS_PROP_COLOR, attr->value());
  -        break;
  -    case ATTR_FACE:
  +    } else if (attr->name() == HTMLAttributes::face()) {
           addCSSProperty(attr, CSS_PROP_FONT_FAMILY, attr->value());
  -        break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   DOMString HTMLFontElementImpl::color() const
   {
  -    return getAttribute(ATTR_COLOR);
  +    return getAttribute(HTMLAttributes::color());
   }
   
   void HTMLFontElementImpl::setColor(const DOMString &value)
   {
  -    setAttribute(ATTR_COLOR, value);
  +    setAttribute(HTMLAttributes::color(), value);
   }
   
   DOMString HTMLFontElementImpl::face() const
   {
  -    return getAttribute(ATTR_FACE);
  +    return getAttribute(HTMLAttributes::face());
   }
   
   void HTMLFontElementImpl::setFace(const DOMString &value)
   {
  -    setAttribute(ATTR_FACE, value);
  +    setAttribute(HTMLAttributes::face(), value);
   }
   
   DOMString HTMLFontElementImpl::size() const
   {
  -    return getAttribute(ATTR_SIZE);
  +    return getAttribute(HTMLAttributes::size());
   }
   
   void HTMLFontElementImpl::setSize(const DOMString &value)
   {
  -    setAttribute(ATTR_SIZE, value);
  +    setAttribute(HTMLAttributes::size(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -588,22 +564,22 @@
   
   DOMString HTMLModElementImpl::cite() const
   {
  -    return getAttribute(ATTR_CITE);
  +    return getAttribute(HTMLAttributes::cite());
   }
   
   void HTMLModElementImpl::setCite(const DOMString &value)
   {
  -    setAttribute(ATTR_CITE, value);
  +    setAttribute(HTMLAttributes::cite(), value);
   }
   
   DOMString HTMLModElementImpl::dateTime() const
   {
  -    return getAttribute(ATTR_DATETIME);
  +    return getAttribute(HTMLAttributes::datetime());
   }
   
   void HTMLModElementImpl::setDateTime(const DOMString &value)
   {
  -    setAttribute(ATTR_DATETIME, value);
  +    setAttribute(HTMLAttributes::datetime(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -615,12 +591,12 @@
   
   DOMString HTMLQuoteElementImpl::cite() const
   {
  -    return getAttribute(ATTR_CITE);
  +    return getAttribute(HTMLAttributes::cite());
   }
   
   void HTMLQuoteElementImpl::setCite(const DOMString &value)
   {
  -    setAttribute(ATTR_CITE, value);
  +    setAttribute(HTMLAttributes::cite(), value);
   }
   
   }
  
  
  
  1.21      +2 -2      WebCore/khtml/html/html_inlineimpl.h
  
  Index: html_inlineimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_inlineimpl.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- html_inlineimpl.h	9 Jul 2005 20:19:10 -0000	1.20
  +++ html_inlineimpl.h	18 Jul 2005 21:44:20 -0000	1.21
  @@ -104,7 +104,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; }
       virtual int tagPriority() const { return 0; }
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
       
       virtual khtml::RenderObject *createRenderer(RenderArena *, khtml::RenderStyle *);
  @@ -124,7 +124,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
       virtual int tagPriority() const { return 1; }
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       DOMString color() const;
  
  
  
  1.11      +42 -66    WebCore/khtml/html/html_listimpl.cpp
  
  Index: html_listimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_listimpl.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- html_listimpl.cpp	9 Jul 2005 20:19:10 -0000	1.10
  +++ html_listimpl.cpp	18 Jul 2005 21:44:20 -0000	1.11
  @@ -25,102 +25,89 @@
   #include "css/cssproperties.h"
   #include "css/cssvalues.h"
   #include "rendering/render_list.h"
  -#include "misc/htmlhashes.h"
   #include "xml/dom_docimpl.h"
   
   using namespace khtml;
   
   namespace DOM {
   
  -bool HTMLUListElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLUListElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_TYPE:
  -            result = eUnorderedList;
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::type()) {
  +        result = eUnorderedList;
  +        return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLUListElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_TYPE:
  +    if (attr->name() == HTMLAttributes::type())
           addCSSProperty(attr, CSS_PROP_LIST_STYLE_TYPE, attr->value());
  -        break;
  -    default:
  +    else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   bool HTMLUListElementImpl::compact() const
   {
  -    return !getAttribute(ATTR_COMPACT).isNull();
  +    return !getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   void HTMLUListElementImpl::setCompact(bool b)
   {
  -    setAttribute(ATTR_COMPACT, b ? "" : 0);
  +    setAttribute(HTMLAttributes::compact(), b ? "" : 0);
   }
   
   DOMString HTMLUListElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLUListElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   // -------------------------------------------------------------------------
   
   bool HTMLDirectoryElementImpl::compact() const
   {
  -    return !getAttribute(ATTR_COMPACT).isNull();
  +    return !getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   void HTMLDirectoryElementImpl::setCompact(bool b)
   {
  -    setAttribute(ATTR_COMPACT, b ? "" : 0);
  +    setAttribute(HTMLAttributes::compact(), b ? "" : 0);
   }
   
   // -------------------------------------------------------------------------
   
   bool HTMLMenuElementImpl::compact() const
   {
  -    return !getAttribute(ATTR_COMPACT).isNull();
  +    return !getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   void HTMLMenuElementImpl::setCompact(bool b)
   {
  -    setAttribute(ATTR_COMPACT, b ? "" : 0);
  +    setAttribute(HTMLAttributes::compact(), b ? "" : 0);
   }
   
   // -------------------------------------------------------------------------
   
  -bool HTMLOListElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLOListElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_TYPE:
  -            result = eListItem; // Share with <li>
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::type()) {
  +        result = eListItem; // Share with <li>
  +        return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLOListElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_TYPE:
  +    if (attr->name() == HTMLAttributes::type()) {
           if ( strcmp( attr->value(), "a" ) == 0 )
               addCSSProperty(attr, CSS_PROP_LIST_STYLE_TYPE, CSS_VAL_LOWER_ALPHA);
           else if ( strcmp( attr->value(), "A" ) == 0 )
  @@ -131,60 +118,52 @@
               addCSSProperty(attr, CSS_PROP_LIST_STYLE_TYPE, CSS_VAL_UPPER_ROMAN);
           else if ( strcmp( attr->value(), "1" ) == 0 )
               addCSSProperty(attr, CSS_PROP_LIST_STYLE_TYPE, CSS_VAL_DECIMAL);
  -        break;
  -    case ATTR_START:
  +    } else if (attr->name() == HTMLAttributes::start()) {
           _start = !attr->isNull() ? attr->value().toInt() : 1;
  -        break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   bool HTMLOListElementImpl::compact() const
   {
  -    return !getAttribute(ATTR_COMPACT).isNull();
  +    return !getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   void HTMLOListElementImpl::setCompact(bool b)
   {
  -    setAttribute(ATTR_COMPACT, b ? "" : 0);
  +    setAttribute(HTMLAttributes::compact(), b ? "" : 0);
   }
   
   void HTMLOListElementImpl::setStart(long start)
   {
  -    setAttribute(ATTR_START, QString::number(start));
  +    setAttribute(HTMLAttributes::start(), QString::number(start));
   }
   
   DOMString HTMLOListElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLOListElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   // -------------------------------------------------------------------------
   
  -bool HTMLLIElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLLIElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_TYPE:
  -            result = eListItem; // Share with <ol> since all the values are the same
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::type()) {
  +        result = eListItem; // Share with <ol> since all the values are the same
  +        return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLLIElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_VALUE:
  +    if (attr->name() == HTMLAttributes::value()) {
           isValued = true;
           requestedValue = !attr->isNull() ? attr->value().toInt() : 0;
   
  @@ -195,8 +174,7 @@
   
               list->setValue(requestedValue);
           }
  -        break;
  -    case ATTR_TYPE:
  +    } else if (attr->name() == HTMLAttributes::type()) {
           if ( strcmp( attr->value(), "a" ) == 0 )
               addCSSProperty(attr, CSS_PROP_LIST_STYLE_TYPE, CSS_VAL_LOWER_ALPHA);
           else if ( strcmp( attr->value(), "A" ) == 0 )
  @@ -209,10 +187,8 @@
               addCSSProperty(attr, CSS_PROP_LIST_STYLE_TYPE, CSS_VAL_DECIMAL);
           else
               addCSSProperty(attr, CSS_PROP_LIST_STYLE_TYPE, attr->value());
  -        break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   void HTMLLIElementImpl::attach()
  @@ -251,34 +227,34 @@
   
   DOMString HTMLLIElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLLIElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   long HTMLLIElementImpl::value() const
   {
  -    return getAttribute(ATTR_VALUE).toInt();
  +    return getAttribute(HTMLAttributes::value()).toInt();
   }
   
   void HTMLLIElementImpl::setValue(long value)
   {
  -    setAttribute(ATTR_VALUE, QString::number(value));
  +    setAttribute(HTMLAttributes::value(), QString::number(value));
   }
   
   // -------------------------------------------------------------------------
   
   bool HTMLDListElementImpl::compact() const
   {
  -    return !getAttribute(ATTR_COMPACT).isNull();
  +    return !getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   void HTMLDListElementImpl::setCompact(bool b)
   {
  -    setAttribute(ATTR_COMPACT, b ? "" : 0);
  +    setAttribute(HTMLAttributes::compact(), b ? "" : 0);
   }
   
   }
  
  
  
  1.9       +3 -3      WebCore/khtml/html/html_listimpl.h
  
  Index: html_listimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_listimpl.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- html_listimpl.h	9 Jul 2005 20:19:10 -0000	1.8
  +++ html_listimpl.h	18 Jul 2005 21:44:21 -0000	1.9
  @@ -41,7 +41,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
       virtual int tagPriority() const { return 5; }
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *);
   
       virtual long start() const { return 1; }
  @@ -92,7 +92,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
       virtual int tagPriority() const { return 5; }
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *);
   
       bool compact() const;
  @@ -120,7 +120,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusOptional; }
       virtual int tagPriority() const { return 3; }
   
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       virtual void attach();
  
  
  
  1.28      +32 -33    WebCore/khtml/html/html_miscimpl.cpp
  
  Index: html_miscimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_miscimpl.cpp,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- html_miscimpl.cpp	9 Jul 2005 20:19:10 -0000	1.27
  +++ html_miscimpl.cpp	18 Jul 2005 21:44:21 -0000	1.28
  @@ -27,7 +27,6 @@
   #include "html/html_imageimpl.h"
   #include "html/html_documentimpl.h"
   
  -#include "misc/htmlhashes.h"
   #include "dom/dom_node.h"
   
   #include <kdebug.h>
  @@ -41,32 +40,32 @@
   
   DOMString HTMLBaseFontElementImpl::color() const
   {
  -    return getAttribute(ATTR_COLOR);
  +    return getAttribute(HTMLAttributes::color());
   }
   
   void HTMLBaseFontElementImpl::setColor(const DOMString &value)
   {
  -    setAttribute(ATTR_COLOR, value);
  +    setAttribute(HTMLAttributes::color(), value);
   }
   
   DOMString HTMLBaseFontElementImpl::face() const
   {
  -    return getAttribute(ATTR_FACE);
  +    return getAttribute(HTMLAttributes::face());
   }
   
   void HTMLBaseFontElementImpl::setFace(const DOMString &value)
   {
  -    setAttribute(ATTR_FACE, value);
  +    setAttribute(HTMLAttributes::face(), value);
   }
   
   DOMString HTMLBaseFontElementImpl::size() const
   {
  -    return getAttribute(ATTR_SIZE);
  +    return getAttribute(HTMLAttributes::size());
   }
   
   void HTMLBaseFontElementImpl::setSize(const DOMString &value)
   {
  -    setAttribute(ATTR_SIZE, value);
  +    setAttribute(HTMLAttributes::size(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -196,12 +195,12 @@
                   break;
               case DOC_LINKS:     // all A _and_ AREA elements with a value for href
                   if (e->hasLocalName(HTMLNames::a()) || e->hasLocalName(HTMLNames::area()))
  -                    if (!e->getAttribute(ATTR_HREF).isNull())
  +                    if (!e->getAttribute(HTMLAttributes::href()).isNull())
                           found = true;
                   break;
               case DOC_ANCHORS:      // all A elements with a value for name or an id attribute
                   if (e->hasLocalName(HTMLNames::a()))
  -                    if (!e->getAttribute(ATTR_NAME).isNull())
  +                    if (!e->getAttribute(HTMLAttributes::name()).isNull())
                           found = true;
                   break;
               case DOC_ALL:
  @@ -307,9 +306,9 @@
                     e->hasLocalName(HTMLNames::embed())))
                   return false;
   
  -            return e->getAttribute(ATTR_NAME) == name && e->getAttribute(ATTR_ID) != name;
  +            return e->getAttribute(HTMLAttributes::name()) == name && e->getAttribute(HTMLAttributes::idAttr()) != name;
           } else
  -            return e->getAttribute(ATTR_ID) == name;
  +            return e->getAttribute(HTMLAttributes::idAttr()) == name;
       } else {
           if (checkName) {
               // document.all returns only images, forms, applets, objects and embeds
  @@ -320,10 +319,10 @@
                     e->hasLocalName(HTMLNames::embed())))
                   return false;
   
  -            return e->getAttribute(ATTR_NAME).domString().lower() == name.lower() &&
  -                e->getAttribute(ATTR_ID).domString().lower() != name.lower();
  +            return e->getAttribute(HTMLAttributes::name()).domString().lower() == name.lower() &&
  +                e->getAttribute(HTMLAttributes::idAttr()).domString().lower() != name.lower();
           } else {
  -            return e->getAttribute(ATTR_ID).domString().lower() == name.lower();
  +            return e->getAttribute(HTMLAttributes::idAttr()).domString().lower() == name.lower();
           }
       }
   }
  @@ -379,8 +378,8 @@
           if (!n->isHTMLElement())
               continue;
           HTMLElementImpl* e = static_cast<HTMLElementImpl*>(n);
  -        QString idAttr = e->getAttribute(ATTR_ID).string();
  -        QString nameAttr = e->getAttribute(ATTR_NAME).string();
  +        QString idAttr = e->getAttribute(HTMLAttributes::idAttr()).string();
  +        QString nameAttr = e->getAttribute(HTMLAttributes::name()).string();
           if (!idAttr.isEmpty()) {
               // add to id cache
               QPtrVector<NodeImpl> *idVector = info->idCache.find(idAttr);
  @@ -523,13 +522,13 @@
       return 0;
   }
   
  -NodeImpl* HTMLFormCollectionImpl::getNamedItem(NodeImpl*, int attr_id, const DOMString& name, bool caseSensitive) const
  +NodeImpl* HTMLFormCollectionImpl::getNamedItem(NodeImpl*, const QualifiedName& attrName, const DOMString& name, bool caseSensitive) const
   {
       info->position = 0;
  -    return getNamedFormItem( attr_id, name, 0, caseSensitive );
  +    return getNamedFormItem(attrName, name, 0, caseSensitive);
   }
   
  -NodeImpl* HTMLFormCollectionImpl::getNamedFormItem(int attr_id, const DOMString& name, int duplicateNumber, bool caseSensitive) const
  +NodeImpl* HTMLFormCollectionImpl::getNamedFormItem(const QualifiedName& attrName, const DOMString& name, int duplicateNumber, bool caseSensitive) const
   {
       if (m_base->nodeType() == Node::ELEMENT_NODE) {
           HTMLElementImpl* baseElement = static_cast<HTMLElementImpl*>(m_base.get());
  @@ -541,9 +540,9 @@
                   if (e->isEnumeratable()) {
                       bool found;
                       if (caseSensitive)
  -                        found = e->getAttribute(attr_id) == name;
  +                        found = e->getAttribute(attrName) == name;
                       else
  -                        found = e->getAttribute(attr_id).domString().lower() == name.lower();
  +                        found = e->getAttribute(attrName).domString().lower() == name.lower();
                       if (found) {
                           foundInputElements = true;
                           if (!duplicateNumber)
  @@ -562,9 +561,9 @@
                   HTMLImageElementImpl* e = f->imgElements[i];
                   bool found;
                   if (caseSensitive)
  -                    found = e->getAttribute(attr_id) == name;
  +                    found = e->getAttribute(attrName) == name;
                   else
  -                    found = e->getAttribute(attr_id).domString().lower() == name.lower();
  +                    found = e->getAttribute(attrName).domString().lower() == name.lower();
                   if (found) {
                       if (!duplicateNumber)
                           return e;
  @@ -588,14 +587,14 @@
   
   NodeImpl * HTMLFormCollectionImpl::nextNamedItemInternal( const DOMString &name ) const
   {
  -    NodeImpl *retval = getNamedFormItem( idsDone ? ATTR_NAME : ATTR_ID, name, ++info->position, true );
  +    NodeImpl *retval = getNamedFormItem( idsDone ? HTMLAttributes::name() : HTMLAttributes::idAttr(), name, ++info->position, true );
       if ( retval )
           return retval;
       if ( idsDone ) // we're done
           return 0;
  -    // After doing all ATTR_ID, do ATTR_NAME
  +    // After doing id, do name
       idsDone = true;
  -    return getNamedItem(m_base->firstChild(), ATTR_NAME, name, true);
  +    return getNamedItem(m_base->firstChild(), HTMLAttributes::name(), name, true);
   }
   
   NodeImpl *HTMLFormCollectionImpl::namedItem( const DOMString &name, bool caseSensitive ) const
  @@ -607,11 +606,11 @@
       // that are allowed a name attribute.
       resetCollectionInfo();
       idsDone = false;
  -    info->current = getNamedItem(m_base->firstChild(), ATTR_ID, name, true);
  +    info->current = getNamedItem(m_base->firstChild(), HTMLAttributes::idAttr(), name, true);
       if(info->current)
           return info->current;
       idsDone = true;
  -    info->current = getNamedItem(m_base->firstChild(), ATTR_NAME, name, true);
  +    info->current = getNamedItem(m_base->firstChild(), HTMLAttributes::name(), name, true);
       return info->current;
   }
   
  @@ -630,7 +629,7 @@
           if(impl->nodeType() == Node::ELEMENT_NODE)
           {
               HTMLElementImpl *e = static_cast<HTMLElementImpl *>(impl);
  -            ok = (e->getAttribute(ATTR_ID) != name);
  +            ok = (e->getAttribute(HTMLAttributes::idAttr()) != name);
               if (!ok)
                   impl = nextNamedItemInternal( name );
           } else // can't happen
  @@ -657,8 +656,8 @@
       for (unsigned i = 0; i < f->formElements.count(); ++i) {
           HTMLGenericFormElementImpl* e = f->formElements[i];
           if (e->isEnumeratable()) {
  -            QString idAttr = e->getAttribute(ATTR_ID).string();
  -            QString nameAttr = e->getAttribute(ATTR_NAME).string();
  +            QString idAttr = e->getAttribute(HTMLAttributes::idAttr()).string();
  +            QString nameAttr = e->getAttribute(HTMLAttributes::name()).string();
               if (!idAttr.isEmpty()) {
                   // add to id cache
                   QPtrVector<NodeImpl> *idVector = info->idCache.find(idAttr);
  @@ -684,8 +683,8 @@
   
       for (unsigned i = 0; i < f->imgElements.count(); ++i) {
           HTMLImageElementImpl* e = f->imgElements[i];
  -        QString idAttr = e->getAttribute(ATTR_ID).string();
  -        QString nameAttr = e->getAttribute(ATTR_NAME).string();
  +        QString idAttr = e->getAttribute(HTMLAttributes::idAttr()).string();
  +        QString nameAttr = e->getAttribute(HTMLAttributes::name()).string();
           if (!idAttr.isEmpty() && !foundInputElements.find(idAttr)) {
               // add to id cache
               QPtrVector<NodeImpl> *idVector = info->idCache.find(idAttr);
  
  
  
  1.18      +2 -2      WebCore/khtml/html/html_miscimpl.h
  
  Index: html_miscimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_miscimpl.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- html_miscimpl.h	9 Jul 2005 20:19:10 -0000	1.17
  +++ html_miscimpl.h	18 Jul 2005 21:44:21 -0000	1.18
  @@ -151,10 +151,10 @@
   protected:
       virtual void updateNameCache() const;
       virtual unsigned long calcLength() const;
  -    virtual NodeImpl *getNamedItem(NodeImpl* current, int attr_id, const DOMString& name, bool caseSensitive) const;
  +    virtual NodeImpl *getNamedItem(NodeImpl* current, const QualifiedName& attrName, const DOMString& name, bool caseSensitive) const;
       virtual NodeImpl *nextNamedItemInternal( const DOMString &name ) const;
   private:
  -    NodeImpl* getNamedFormItem(int attr_id, const DOMString& name, int duplicateNumber, bool caseSensitive) const;
  +    NodeImpl* getNamedFormItem(const QualifiedName& attrName, const DOMString& name, int duplicateNumber, bool caseSensitive) const;
       mutable int currentPos;
   };
   
  
  
  
  1.69      +181 -221  WebCore/khtml/html/html_objectimpl.cpp
  
  Index: html_objectimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.cpp,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- html_objectimpl.cpp	9 Jul 2005 20:19:10 -0000	1.68
  +++ html_objectimpl.cpp	18 Jul 2005 21:44:21 -0000	1.69
  @@ -25,7 +25,6 @@
   
   #include "khtml_part.h"
   #include "dom/dom_string.h"
  -#include "misc/htmlhashes.h"
   #include "khtmlview.h"
   #include <qstring.h>
   #include <qmap.h>
  @@ -74,61 +73,53 @@
       return newChild->hasTagName(HTMLNames::param()) || HTMLElementImpl::checkDTD(newChild);
   }
   
  -bool HTMLAppletElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLAppletElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_WIDTH:
  -        case ATTR_HEIGHT:
  -        case ATTR_VSPACE:
  -        case ATTR_HSPACE:
  +    if (attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::height() ||
  +        attrName == HTMLAttributes::vspace() ||
  +        attrName == HTMLAttributes::hspace()) {
               result = eUniversal;
               return false;
  -        case ATTR_ALIGN:
  -            result = eReplaced; // Share with <img> since the alignment behavior is the same.
  -            return false;
  -        default:
  -            break;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    if (attrName == HTMLAttributes::align()) {
  +        result = eReplaced; // Share with <img> since the alignment behavior is the same.
  +        return false;
  +    }
  +    
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLAppletElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id()) {
  -    case ATTR_ALT:
  -    case ATTR_ARCHIVE:
  -    case ATTR_CODE:
  -    case ATTR_CODEBASE:
  -    case ATTR_MAYSCRIPT:
  -    case ATTR_NAME:
  -    case ATTR_OBJECT:
  -        break;
  -    case ATTR_WIDTH:
  +    if (attr->name() == HTMLAttributes::alt() ||
  +        attr->name() == HTMLAttributes::archive() ||
  +        attr->name() == HTMLAttributes::code() ||
  +        attr->name() == HTMLAttributes::codebase() ||
  +        attr->name() == HTMLAttributes::mayscript() ||
  +        attr->name() == HTMLAttributes::name() ||
  +        attr->name() == HTMLAttributes::object()) {
  +        // Do nothing.
  +    } else if (attr->name() == HTMLAttributes::width()) {
           addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  -        break;
  -    case ATTR_HEIGHT:
  +    } else if (attr->name() == HTMLAttributes::height()) {
           addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
  -        break;
  -    case ATTR_VSPACE:
  +    } else if (attr->name() == HTMLAttributes::vspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  -        break;
  -    case ATTR_HSPACE:
  +    } else if (attr->name() == HTMLAttributes::hspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  -        break;
  -    case ATTR_ALIGN:
  +    } else if (attr->name() == HTMLAttributes::align()) {
           addHTMLAlignment(attr);
  -        break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   bool HTMLAppletElementImpl::rendererIsNeeded(RenderStyle *style)
   {
  -    return !getAttribute(ATTR_CODE).isNull();
  +    return !getAttribute(HTMLAttributes::code()).isNull();
   }
   
   RenderObject *HTMLAppletElementImpl::createRenderer(RenderArena *arena, RenderStyle *style)
  @@ -140,21 +131,21 @@
       {
   	QMap<QString, QString> args;
   
  -	args.insert( "code", getAttribute(ATTR_CODE).string());
  -	DOMString codeBase = getAttribute(ATTR_CODEBASE);
  +	args.insert( "code", getAttribute(HTMLAttributes::code()).string());
  +	DOMString codeBase = getAttribute(HTMLAttributes::codebase());
   	if(!codeBase.isNull())
   	    args.insert( "codeBase", codeBase.string() );
   	DOMString name = getDocument()->htmlMode() != DocumentImpl::XHtml ?
  -			 getAttribute(ATTR_NAME) : getAttribute(ATTR_ID);
  +			 getAttribute(HTMLAttributes::name()) : getAttribute(HTMLAttributes::idAttr());
   	if(!name.isNull())
   	    args.insert( "name", name.string() );
  -	DOMString archive = getAttribute(ATTR_ARCHIVE);
  +	DOMString archive = getAttribute(HTMLAttributes::archive());
   	if(!archive.isNull())
   	    args.insert( "archive", archive.string() );
   
   	args.insert( "baseURL", getDocument()->baseURL() );
   
  -        DOMString mayScript = getAttribute(ATTR_MAYSCRIPT);
  +        DOMString mayScript = getAttribute(HTMLAttributes::mayscript());
           if (!mayScript.isNull())
               args.insert("mayScript", mayScript.string());
   
  @@ -242,112 +233,112 @@
   
   DOMString HTMLAppletElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLAppletElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLAppletElementImpl::alt() const
   {
  -    return getAttribute(ATTR_ALT);
  +    return getAttribute(HTMLAttributes::alt());
   }
   
   void HTMLAppletElementImpl::setAlt(const DOMString &value)
   {
  -    setAttribute(ATTR_ALT, value);
  +    setAttribute(HTMLAttributes::alt(), value);
   }
   
   DOMString HTMLAppletElementImpl::archive() const
   {
  -    return getAttribute(ATTR_ARCHIVE);
  +    return getAttribute(HTMLAttributes::archive());
   }
   
   void HTMLAppletElementImpl::setArchive(const DOMString &value)
   {
  -    setAttribute(ATTR_ARCHIVE, value);
  +    setAttribute(HTMLAttributes::archive(), value);
   }
   
   DOMString HTMLAppletElementImpl::code() const
   {
  -    return getAttribute(ATTR_CODE);
  +    return getAttribute(HTMLAttributes::code());
   }
   
   void HTMLAppletElementImpl::setCode(const DOMString &value)
   {
  -    setAttribute(ATTR_CODE, value);
  +    setAttribute(HTMLAttributes::code(), value);
   }
   
   DOMString HTMLAppletElementImpl::codeBase() const
   {
  -    return getAttribute(ATTR_CODEBASE);
  +    return getAttribute(HTMLAttributes::codebase());
   }
   
   void HTMLAppletElementImpl::setCodeBase(const DOMString &value)
   {
  -    setAttribute(ATTR_CODEBASE, value);
  +    setAttribute(HTMLAttributes::codebase(), value);
   }
   
   DOMString HTMLAppletElementImpl::height() const
   {
  -    return getAttribute(ATTR_HEIGHT);
  +    return getAttribute(HTMLAttributes::height());
   }
   
   void HTMLAppletElementImpl::setHeight(const DOMString &value)
   {
  -    setAttribute(ATTR_HEIGHT, value);
  +    setAttribute(HTMLAttributes::height(), value);
   }
   
   DOMString HTMLAppletElementImpl::hspace() const
   {
  -    return getAttribute(ATTR_HSPACE);
  +    return getAttribute(HTMLAttributes::hspace());
   }
   
   void HTMLAppletElementImpl::setHspace(const DOMString &value)
   {
  -    setAttribute(ATTR_HSPACE, value);
  +    setAttribute(HTMLAttributes::hspace(), value);
   }
   
   DOMString HTMLAppletElementImpl::name() const
   {
  -    return getAttribute(ATTR_NAME);
  +    return getAttribute(HTMLAttributes::name());
   }
   
   void HTMLAppletElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   DOMString HTMLAppletElementImpl::object() const
   {
  -    return getAttribute(ATTR_OBJECT);
  +    return getAttribute(HTMLAttributes::object());
   }
   
   void HTMLAppletElementImpl::setObject(const DOMString &value)
   {
  -    setAttribute(ATTR_OBJECT, value);
  +    setAttribute(HTMLAttributes::object(), value);
   }
   
   DOMString HTMLAppletElementImpl::vspace() const
   {
  -    return getAttribute(ATTR_VSPACE);
  +    return getAttribute(HTMLAttributes::vspace());
   }
   
   void HTMLAppletElementImpl::setVspace(const DOMString &value)
   {
  -    setAttribute(ATTR_VSPACE, value);
  +    setAttribute(HTMLAttributes::vspace(), value);
   }
   
   DOMString HTMLAppletElementImpl::width() const
   {
  -    return getAttribute(ATTR_WIDTH);
  +    return getAttribute(HTMLAttributes::width());
   }
   
   void HTMLAppletElementImpl::setWidth(const DOMString &value)
   {
  -    setAttribute(ATTR_WIDTH, value);
  +    setAttribute(HTMLAttributes::width(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -391,87 +382,72 @@
   }
   #endif
   
  -bool HTMLEmbedElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLEmbedElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_WIDTH:
  -        case ATTR_HEIGHT:
  -        case ATTR_BORDER:
  -        case ATTR_VSPACE:
  -        case ATTR_HSPACE:
  -        case ATTR_VALIGN:
  -        case ATTR_HIDDEN:
  -            result = eUniversal;
  -            return false;
  -        case ATTR_ALIGN:
  -            result = eReplaced; // Share with <img> since the alignment behavior is the same.
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::height() ||
  +        attrName == HTMLAttributes::border() ||
  +        attrName == HTMLAttributes::vspace() ||
  +        attrName == HTMLAttributes::hspace() ||
  +        attrName == HTMLAttributes::valign() ||
  +        attrName == HTMLAttributes::hidden()) {
  +        result = eUniversal;
  +        return false;
  +    }
  +        
  +    if (attrName == HTMLAttributes::align()) {
  +        result = eReplaced; // Share with <img> since the alignment behavior is the same.
  +        return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLEmbedElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -  QString val = attr->value().string();
  +    QString val = attr->value().string();
     
  -  int pos;
  -  switch ( attr->id() )
  -  {
  -     case ATTR_TYPE:
  +    int pos;
  +    if (attr->name() == HTMLAttributes::type()) {
           serviceType = val.lower();
           pos = serviceType.find( ";" );
           if ( pos!=-1 )
               serviceType = serviceType.left( pos );
  -        break;
  -     case ATTR_CODE:
  -     case ATTR_SRC:
  +    } else if (attr->name() == HTMLAttributes::code() ||
  +               attr->name() == HTMLAttributes::src()) {
            url = khtml::parseURL(attr->value()).string();
  -         break;
  -     case ATTR_WIDTH:
  +    } else if (attr->name() == HTMLAttributes::width()) {
           addCSSLength( attr, CSS_PROP_WIDTH, attr->value() );
  -        break;
  -     case ATTR_HEIGHT:
  +    } else if (attr->name() == HTMLAttributes::height()) {
           addCSSLength( attr, CSS_PROP_HEIGHT, attr->value());
  -        break;
  -     case ATTR_BORDER:
  +    } else if (attr->name() == HTMLAttributes::border()) {
           addCSSLength(attr, CSS_PROP_BORDER_WIDTH, attr->value());
           addCSSProperty( attr, CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID );
           addCSSProperty( attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID );
           addCSSProperty( attr, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID );
           addCSSProperty( attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID );
  -        break;
  -     case ATTR_VSPACE:
  +    } else if (attr->name() == HTMLAttributes::vspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  -        break;
  -     case ATTR_HSPACE:
  +    } else if (attr->name() == HTMLAttributes::hspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  -        break;
  -     case ATTR_ALIGN:
  +    } else if (attr->name() == HTMLAttributes::align()) {
   	addHTMLAlignment(attr);
  -	break;
  -     case ATTR_VALIGN:
  +    } else if (attr->name() == HTMLAttributes::valign()) {
           addCSSProperty(attr, CSS_PROP_VERTICAL_ALIGN, attr->value());
  -        break;
  -     case ATTR_PLUGINPAGE:
  -     case ATTR_PLUGINSPAGE:
  +    } else if (attr->name() == HTMLAttributes::pluginpage() ||
  +               attr->name() == HTMLAttributes::pluginspage()) {
           pluginPage = val;
  -        break;
  -     case ATTR_HIDDEN:
  +    } else if (attr->name() == HTMLAttributes::hidden()) {
           if (val.lower()=="yes" || val.lower()=="true") {
               // FIXME: Not dynamic, but it's not really important that such a rarely-used
               // feature work dynamically.
               addCSSLength( attr, CSS_PROP_WIDTH, "0" );
               addCSSLength( attr, CSS_PROP_HEIGHT, "0" );
           }
  -        break;
  -     default:
  -        HTMLElementImpl::parseMappedAttribute( attr );
  -  }
  +    } else
  +        HTMLElementImpl::parseMappedAttribute(attr);
   }
   
   bool HTMLEmbedElementImpl::rendererIsNeeded(RenderStyle *style)
  @@ -497,7 +473,7 @@
   
   bool HTMLEmbedElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_SRC;
  +    return attr->name() == HTMLAttributes::src();
   }
   
   // -------------------------------------------------------------------------
  @@ -562,86 +538,72 @@
       return 0;
   }
   
  -bool HTMLObjectElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLObjectElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch (attr) {
  -        case ATTR_WIDTH:
  -        case ATTR_HEIGHT:
  -        case ATTR_VSPACE:
  -        case ATTR_HSPACE:
  -            result = eUniversal;
  -            return false;
  -        case ATTR_ALIGN:
  -            result = eReplaced; // Share with <img> since the alignment behavior is the same.
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::height() ||
  +        attrName == HTMLAttributes::vspace() ||
  +        attrName == HTMLAttributes::hspace()) {
  +        result = eUniversal;
  +        return false;
  +    }
  +    
  +    if (attrName == HTMLAttributes::align()) {
  +        result = eReplaced; // Share with <img> since the alignment behavior is the same.
  +        return false;
       }
       
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLObjectElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -  QString val = attr->value().string();
  -  int pos;
  -  switch ( attr->id() )
  -  {
  -    case ATTR_TYPE:
  -      serviceType = val.lower();
  -      pos = serviceType.find( ";" );
  -      if ( pos!=-1 )
  +    QString val = attr->value().string();
  +    int pos;
  +    if (attr->name() == HTMLAttributes::type()) {
  +        serviceType = val.lower();
  +        pos = serviceType.find( ";" );
  +        if ( pos!=-1 )
             serviceType = serviceType.left( pos );
  -      if (m_render)
  +        if (m_render)
             needWidgetUpdate = true;
  -      if (!isImageType() && m_imageLoader) {
  +        if (!isImageType() && m_imageLoader) {
             delete m_imageLoader;
             m_imageLoader = 0;
  -      }
  -      break;
  -    case ATTR_DATA:
  -      url = khtml::parseURL(  val ).string();
  -      if (m_render)
  +        }
  +    } else if (attr->name() == HTMLAttributes::data()) {
  +        url = khtml::parseURL(  val ).string();
  +        if (m_render)
             needWidgetUpdate = true;
  -      if (m_render && isImageType()) {
  +        if (m_render && isImageType()) {
             if (!m_imageLoader)
                 m_imageLoader = new HTMLImageLoader(this);
             m_imageLoader->updateFromElement();
  -      }
  -      break;
  -    case ATTR_WIDTH:
  -      addCSSLength( attr, CSS_PROP_WIDTH, attr->value());
  -      break;
  -    case ATTR_HEIGHT:
  -      addCSSLength( attr, CSS_PROP_HEIGHT, attr->value());
  -      break;
  -    case ATTR_VSPACE:
  +        }
  +    } else if (attr->name() == HTMLAttributes::width()) {
  +        addCSSLength( attr, CSS_PROP_WIDTH, attr->value());
  +    } else if (attr->name() == HTMLAttributes::height()) {
  +        addCSSLength( attr, CSS_PROP_HEIGHT, attr->value());
  +    } else if (attr->name() == HTMLAttributes::vspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  -        break;
  -    case ATTR_HSPACE:
  +    } else if (attr->name() == HTMLAttributes::hspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  -        break;
  -    case ATTR_ALIGN:
  +    } else if (attr->name() == HTMLAttributes::align()) {
           addHTMLAlignment(attr);
  -        break;
  -    case ATTR_CLASSID:
  -      classId = val;
  -      if (m_render)
  +    } else if (attr->name() == HTMLAttributes::classid()) {
  +        classId = val;
  +        if (m_render)
             needWidgetUpdate = true;
  -      break;
  -    case ATTR_ONLOAD: // ### support load/unload on object elements
  +    } else if (attr->name() == HTMLAttributes::onload()) {
           setHTMLEventListener(EventImpl::LOAD_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    case ATTR_ONUNLOAD:
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else if (attr->name() == HTMLAttributes::onunload()) {
           setHTMLEventListener(EventImpl::UNLOAD_EVENT,
  -	    getDocument()->createHTMLEventListener(attr->value().string(), this));
  -        break;
  -    default:
  -      HTMLElementImpl::parseMappedAttribute( attr );
  -  }
  +                             getDocument()->createHTMLEventListener(attr->value().string(), this));
  +    } else
  +        HTMLElementImpl::parseMappedAttribute(attr);
   }
   
   DocumentImpl* HTMLObjectElementImpl::contentDocument() const
  @@ -741,7 +703,7 @@
   
   bool HTMLObjectElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return (attr->id() == ATTR_DATA || (attr->id() == ATTR_USEMAP && attr->value().domString()[0] != '#'));
  +    return (attr->name() == HTMLAttributes::data() || (attr->name() == HTMLAttributes::usemap() && attr->value().domString()[0] != '#'));
   }
   
   bool HTMLObjectElementImpl::isImageType()
  @@ -779,172 +741,172 @@
   
   DOMString HTMLObjectElementImpl::code() const
   {
  -    return getAttribute(ATTR_CODE);
  +    return getAttribute(HTMLAttributes::code());
   }
   
   void HTMLObjectElementImpl::setCode(const DOMString &value)
   {
  -    setAttribute(ATTR_CODE, value);
  +    setAttribute(HTMLAttributes::code(), value);
   }
   
   DOMString HTMLObjectElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLObjectElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLObjectElementImpl::archive() const
   {
  -    return getAttribute(ATTR_ARCHIVE);
  +    return getAttribute(HTMLAttributes::archive());
   }
   
   void HTMLObjectElementImpl::setArchive(const DOMString &value)
   {
  -    setAttribute(ATTR_ARCHIVE, value);
  +    setAttribute(HTMLAttributes::archive(), value);
   }
   
   DOMString HTMLObjectElementImpl::border() const
   {
  -    return getAttribute(ATTR_BORDER);
  +    return getAttribute(HTMLAttributes::border());
   }
   
   void HTMLObjectElementImpl::setBorder(const DOMString &value)
   {
  -    setAttribute(ATTR_BORDER, value);
  +    setAttribute(HTMLAttributes::border(), value);
   }
   
   DOMString HTMLObjectElementImpl::codeBase() const
   {
  -    return getAttribute(ATTR_CODEBASE);
  +    return getAttribute(HTMLAttributes::codebase());
   }
   
   void HTMLObjectElementImpl::setCodeBase(const DOMString &value)
   {
  -    setAttribute(ATTR_CODEBASE, value);
  +    setAttribute(HTMLAttributes::codebase(), value);
   }
   
   DOMString HTMLObjectElementImpl::codeType() const
   {
  -    return getAttribute(ATTR_CODETYPE);
  +    return getAttribute(HTMLAttributes::codetype());
   }
   
   void HTMLObjectElementImpl::setCodeType(const DOMString &value)
   {
  -    setAttribute(ATTR_CODETYPE, value);
  +    setAttribute(HTMLAttributes::codetype(), value);
   }
   
   DOMString HTMLObjectElementImpl::data() const
   {
  -    return getAttribute(ATTR_DATA);
  +    return getAttribute(HTMLAttributes::data());
   }
   
   void HTMLObjectElementImpl::setData(const DOMString &value)
   {
  -    setAttribute(ATTR_DATA, value);
  +    setAttribute(HTMLAttributes::data(), value);
   }
   
   bool HTMLObjectElementImpl::declare() const
   {
  -    return !getAttribute(ATTR_DECLARE).isNull();
  +    return !getAttribute(HTMLAttributes::declare()).isNull();
   }
   
   void HTMLObjectElementImpl::setDeclare(bool declare)
   {
  -    setAttribute(ATTR_DECLARE, declare ? "" : 0);
  +    setAttribute(HTMLAttributes::declare(), declare ? "" : 0);
   }
   
   DOMString HTMLObjectElementImpl::height() const
   {
  -    return getAttribute(ATTR_HEIGHT);
  +    return getAttribute(HTMLAttributes::height());
   }
   
   void HTMLObjectElementImpl::setHeight(const DOMString &value)
   {
  -    setAttribute(ATTR_HEIGHT, value);
  +    setAttribute(HTMLAttributes::height(), value);
   }
   
   DOMString HTMLObjectElementImpl::hspace() const
   {
  -    return getAttribute(ATTR_HSPACE);
  +    return getAttribute(HTMLAttributes::hspace());
   }
   
   void HTMLObjectElementImpl::setHspace(const DOMString &value)
   {
  -    setAttribute(ATTR_HSPACE, value);
  +    setAttribute(HTMLAttributes::hspace(), value);
   }
   
   DOMString HTMLObjectElementImpl::name() const
   {
  -    return getAttribute(ATTR_NAME);
  +    return getAttribute(HTMLAttributes::name());
   }
   
   void HTMLObjectElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   DOMString HTMLObjectElementImpl::standby() const
   {
  -    return getAttribute(ATTR_STANDBY);
  +    return getAttribute(HTMLAttributes::standby());
   }
   
   void HTMLObjectElementImpl::setStandby(const DOMString &value)
   {
  -    setAttribute(ATTR_STANDBY, value);
  +    setAttribute(HTMLAttributes::standby(), value);
   }
   
   long HTMLObjectElementImpl::tabIndex() const
   {
  -    return getAttribute(ATTR_TABINDEX).toInt();
  +    return getAttribute(HTMLAttributes::tabindex()).toInt();
   }
   
   void HTMLObjectElementImpl::setTabIndex(long tabIndex)
   {
  -    setAttribute(ATTR_TABINDEX, QString::number(tabIndex));
  +    setAttribute(HTMLAttributes::tabindex(), QString::number(tabIndex));
   }
   
   DOMString HTMLObjectElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLObjectElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   DOMString HTMLObjectElementImpl::useMap() const
   {
  -    return getAttribute(ATTR_USEMAP);
  +    return getAttribute(HTMLAttributes::usemap());
   }
   
   void HTMLObjectElementImpl::setUseMap(const DOMString &value)
   {
  -    setAttribute(ATTR_USEMAP, value);
  +    setAttribute(HTMLAttributes::usemap(), value);
   }
   
   DOMString HTMLObjectElementImpl::vspace() const
   {
  -    return getAttribute(ATTR_VSPACE);
  +    return getAttribute(HTMLAttributes::vspace());
   }
   
   void HTMLObjectElementImpl::setVspace(const DOMString &value)
   {
  -    setAttribute(ATTR_VSPACE, value);
  +    setAttribute(HTMLAttributes::vspace(), value);
   }
   
   DOMString HTMLObjectElementImpl::width() const
   {
  -    return getAttribute(ATTR_WIDTH);
  +    return getAttribute(HTMLAttributes::width());
   }
   
   void HTMLObjectElementImpl::setWidth(const DOMString &value)
   {
  -    setAttribute(ATTR_WIDTH, value);
  +    setAttribute(HTMLAttributes::width(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -960,26 +922,24 @@
   
   void HTMLParamElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch( attr->id() )
  -    {
  -    case ATTR_ID:
  +    if (attr->name() == HTMLAttributes::idAttr()) {
           // Must call base class so that hasID bit gets set.
           HTMLElementImpl::parseMappedAttribute(attr);
  -        if (getDocument()->htmlMode() != DocumentImpl::XHtml) break;
  -        // fall through
  -    case ATTR_NAME:
  +        if (getDocument()->htmlMode() != DocumentImpl::XHtml)
  +            return;
           m_name = attr->value();
  -        break;
  -    case ATTR_VALUE:
  +    } else if (attr->name() == HTMLAttributes::name()) {
  +        m_name = attr->value();
  +    } else if (attr->name() == HTMLAttributes::value()) {
           m_value = attr->value();
  -        break;
  -    }
  +    } else
  +        HTMLElementImpl::parseMappedAttribute(attr);
   }
   
   bool HTMLParamElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    if (attr->id() == ATTR_VALUE) {
  -        AttributeImpl *attr = attributes()->getAttributeItem(ATTR_NAME);
  +    if (attr->name() == HTMLAttributes::value()) {
  +        AttributeImpl *attr = attributes()->getAttributeItem(HTMLAttributes::name());
           if (attr) {
               DOMString value = attr->value().string().lower();
               if (value == "src" || value == "movie" || value == "data") {
  @@ -992,32 +952,32 @@
   
   void HTMLParamElementImpl::setName(const DOMString &value)
   {
  -    setAttribute(ATTR_NAME, value);
  +    setAttribute(HTMLAttributes::name(), value);
   }
   
   DOMString HTMLParamElementImpl::type() const
   {
  -    return getAttribute(ATTR_TYPE);
  +    return getAttribute(HTMLAttributes::type());
   }
   
   void HTMLParamElementImpl::setType(const DOMString &value)
   {
  -    setAttribute(ATTR_TYPE, value);
  +    setAttribute(HTMLAttributes::type(), value);
   }
   
   void HTMLParamElementImpl::setValue(const DOMString &value)
   {
  -    setAttribute(ATTR_VALUE, value);
  +    setAttribute(HTMLAttributes::value(), value);
   }
   
   DOMString HTMLParamElementImpl::valueType() const
   {
  -    return getAttribute(ATTR_VALUETYPE);
  +    return getAttribute(HTMLAttributes::valuetype());
   }
   
   void HTMLParamElementImpl::setValueType(const DOMString &value)
   {
  -    setAttribute(ATTR_VALUETYPE, value);
  +    setAttribute(HTMLAttributes::valuetype(), value);
   }
   
   }
  
  
  
  1.33      +3 -3      WebCore/khtml/html/html_objectimpl.h
  
  Index: html_objectimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- html_objectimpl.h	9 Jul 2005 20:19:10 -0000	1.32
  +++ html_objectimpl.h	18 Jul 2005 21:44:21 -0000	1.33
  @@ -48,7 +48,7 @@
       virtual int tagPriority() const { return 1; }
       virtual bool checkDTD(const NodeImpl* newChild);
   	
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *token);
       
       virtual bool rendererIsNeeded(khtml::RenderStyle *);
  @@ -119,7 +119,7 @@
       virtual int tagPriority() const { return 0; }
       virtual bool checkDTD(const NodeImpl* newChild);
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       virtual void attach();
  @@ -156,7 +156,7 @@
   
       HTMLFormElementImpl *form() const;
   
  -    virtual bool mapToEntry(Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *token);
   
       virtual void attach();
  
  
  
  1.56      +192 -252  WebCore/khtml/html/html_tableimpl.cpp
  
  Index: html_tableimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.cpp,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- html_tableimpl.cpp	14 Jul 2005 20:23:52 -0000	1.55
  +++ html_tableimpl.cpp	18 Jul 2005 21:44:21 -0000	1.56
  @@ -30,7 +30,6 @@
   #include "dom/dom_exception.h"
   #include "dom/dom_node.h"
   
  -#include "misc/htmlhashes.h"
   #include "khtmlview.h"
   #include "khtml_part.h"
   
  @@ -371,50 +370,50 @@
       }
   } 
   
  -bool HTMLTableElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLTableElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch(attr) {
  -        case ATTR_BACKGROUND:
  -            result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  -            return false;
  -        case ATTR_WIDTH:
  -        case ATTR_HEIGHT:
  -        case ATTR_BGCOLOR:
  -        case ATTR_CELLSPACING:
  -        case ATTR_VSPACE:
  -        case ATTR_HSPACE:
  -        case ATTR_VALIGN:
  -            result = eUniversal;
  -            return false;
  -        case ATTR_BORDERCOLOR:
  -            result = eUniversal;
  -            return true;
  -        case ATTR_BORDER:
  -            result = eTable;
  -            return true;
  -        case ATTR_ALIGN:
  -            result = eTable;
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::background()) {
  +        result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  +        return false;
  +    }
  +    
  +    if (attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::height() ||
  +        attrName == HTMLAttributes::bgcolor() ||
  +        attrName == HTMLAttributes::cellspacing() ||
  +        attrName == HTMLAttributes::vspace() ||
  +        attrName == HTMLAttributes::hspace() ||
  +        attrName == HTMLAttributes::valign()) {
  +        result = eUniversal;
  +        return false;
  +    }
  +    
  +    if (attrName == HTMLAttributes::bordercolor()) {
  +        result = eUniversal;
  +        return true;
  +    }
  +    
  +    if (attrName == HTMLAttributes::border()) {
  +        result = eTable;
  +        return true;
       }
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    
  +    if (attrName == HTMLAttributes::align()) {
  +        result = eTable;
  +        return false;
  +    } 
  +    
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLTableElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_WIDTH:
  +    if (attr->name() == HTMLAttributes::width()) {
           addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  -        break;
  -    case ATTR_HEIGHT:
  +    } else if (attr->name() == HTMLAttributes::height()) {
           addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
  -        break;
  -    case ATTR_BORDER:
  -    {
  +    } else if (attr->name() == HTMLAttributes::border())  {
           m_noBorder = true;
  -        if (attr->isNull()) break;
           if (attr->decl()) {
               CSSValueImpl* val = attr->decl()->getPropertyCSSValue(CSS_PROP_BORDER_LEFT_WIDTH);
               if (val) {
  @@ -426,7 +425,7 @@
                   val->deref();
               }
           }
  -        else {
  +        else if (!attr->isNull()) {
               // ### this needs more work, as the border value is not only
               //     the border of the box, but also between the cells
               int border = 0;
  @@ -448,12 +447,9 @@
           else
               frame = Box, rules = All;
   #endif
  -        break;
  -    }
  -    case ATTR_BGCOLOR:
  +    } else if (attr->name() == HTMLAttributes::bgcolor()) {
           addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
  -        break;
  -    case ATTR_BORDERCOLOR:
  +    } else if (attr->name() == HTMLAttributes::bordercolor()) {
           m_solid = attr->decl();
           if (!attr->decl() && !attr->isEmpty()) {
               addCSSColor(attr, CSS_PROP_BORDER_COLOR, attr->value());
  @@ -463,15 +459,11 @@
               addCSSProperty(attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID);
               m_solid = true;
           }
  -        break;
  -    case ATTR_BACKGROUND:
  -    {
  +    } else if (attr->name() == HTMLAttributes::background()) {
           QString url = khtml::parseURL( attr->value() ).string();
           if (!url.isEmpty())
               addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
  -        break;
  -    }
  -    case ATTR_FRAME:
  +    } else if (attr->name() == HTMLAttributes::frame()) {
   #if 0
           if ( strcasecmp( attr->value(), "void" ) == 0 )
               frame = Void;
  @@ -492,8 +484,7 @@
           else if ( strcasecmp( attr->value(), "rhs" ) == 0 )
               frame = Rhs;
   #endif
  -        break;
  -    case ATTR_RULES:
  +    } else if (attr->name() == HTMLAttributes::rules()) {
   #if 0
           if ( strcasecmp( attr->value(), "none" ) == 0 )
               rules = None;
  @@ -506,12 +497,10 @@
           else if ( strcasecmp( attr->value(), "all" ) == 0 )
               rules = All;
   #endif
  -        break;
  -   case ATTR_CELLSPACING:
  +    } else if (attr->name() == HTMLAttributes::cellspacing()) {
           if (!attr->value().isEmpty())
               addCSSLength(attr, CSS_PROP_BORDER_SPACING, attr->value());
  -        break;
  -    case ATTR_CELLPADDING:
  +    } else if (attr->name() == HTMLAttributes::cellpadding()) {
           if (!attr->value().isEmpty())
               padding = kMax( 0, attr->value().toInt() );
           else
  @@ -521,45 +510,34 @@
   	    if (!m_render->needsLayout())
   	        m_render->setNeedsLayout(true);
           }
  -        break;
  -    case ATTR_COLS:
  -    {
  +    } else if (attr->name() == HTMLAttributes::cols()) {
           // ###
   #if 0
           int c;
           c = attr->val()->toInt();
           addColumns(c-totalCols);
  -        break;
   #endif
  -    }
  -    case ATTR_VSPACE:
  +    } else if (attr->name() == HTMLAttributes::vspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
  -        break;
  -    case ATTR_HSPACE:
  +    } else if (attr->name() == HTMLAttributes::hspace()) {
           addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
  -        break;
  -    case ATTR_ALIGN:
  +    } else if (attr->name() == HTMLAttributes::align()) {
           if (!attr->value().isEmpty())
               addCSSProperty(attr, CSS_PROP_FLOAT, attr->value());
  -        break;
  -    case ATTR_VALIGN:
  +    } else if (attr->name() == HTMLAttributes::valign()) {
           if (!attr->value().isEmpty())
               addCSSProperty(attr, CSS_PROP_VERTICAL_ALIGN, attr->value());
  -        break;
  -    case ATTR_NOSAVE:
  -	break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   CSSMutableStyleDeclarationImpl* HTMLTableElementImpl::additionalAttributeStyleDecl()
   {
       if (m_noBorder)
           return 0;
  -    MappedAttributeImpl attr(ATTR_TABLEBORDER, m_solid ? "solid" : "outset");
  +    MappedAttributeImpl attr(HTMLAttributes::tableborder(), m_solid ? "solid" : "outset");
       CSSMappedAttributeDeclarationImpl* decl = getMappedAttributeDecl(ePersistent, &attr);
       if (!decl) {
           decl = new CSSMappedAttributeDeclarationImpl(0);
  @@ -578,14 +556,14 @@
           setMappedAttributeDecl(ePersistent, &attr, decl);
           decl->setParent(0);
           decl->setNode(0);
  -        decl->setMappedState(ePersistent, attr.id(), attr.value());
  +        decl->setMappedState(ePersistent, attr.name(), attr.value());
       }
       return decl;
   }
   
   CSSMutableStyleDeclarationImpl* HTMLTableElementImpl::getSharedCellDecl()
   {
  -    MappedAttributeImpl attr(ATTR_CELLBORDER, m_noBorder ? "none" : (m_solid ? "solid" : "inset"));
  +    MappedAttributeImpl attr(HTMLAttributes::cellborder(), m_noBorder ? "none" : (m_solid ? "solid" : "inset"));
       CSSMappedAttributeDeclarationImpl* decl = getMappedAttributeDecl(ePersistent, &attr);
       if (!decl) {
           decl = new CSSMappedAttributeDeclarationImpl(0);
  @@ -610,7 +588,7 @@
           setMappedAttributeDecl(ePersistent, &attr, decl);
           decl->setParent(0);
           decl->setNode(0);
  -        decl->setMappedState(ePersistent, attr.id(), attr.value());
  +        decl->setMappedState(ePersistent, attr.name(), attr.value());
       }
       return decl;
   }
  @@ -625,7 +603,7 @@
   
   bool HTMLTableElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_BACKGROUND;
  +    return attr->name() == HTMLAttributes::background();
   }
   
   SharedPtr<HTMLCollectionImpl> HTMLTableElementImpl::rows()
  @@ -640,133 +618,128 @@
   
   DOMString HTMLTableElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLTableElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLTableElementImpl::bgColor() const
   {
  -    return getAttribute(ATTR_BGCOLOR);
  +    return getAttribute(HTMLAttributes::bgcolor());
   }
   
   void HTMLTableElementImpl::setBgColor(const DOMString &value)
   {
  -    setAttribute(ATTR_BGCOLOR, value);
  +    setAttribute(HTMLAttributes::bgcolor(), value);
   }
   
   DOMString HTMLTableElementImpl::border() const
   {
  -    return getAttribute(ATTR_BORDER);
  +    return getAttribute(HTMLAttributes::border());
   }
   
   void HTMLTableElementImpl::setBorder(const DOMString &value)
   {
  -    setAttribute(ATTR_BORDER, value);
  +    setAttribute(HTMLAttributes::border(), value);
   }
   
   DOMString HTMLTableElementImpl::cellPadding() const
   {
  -    return getAttribute(ATTR_CELLPADDING);
  +    return getAttribute(HTMLAttributes::cellpadding());
   }
   
   void HTMLTableElementImpl::setCellPadding(const DOMString &value)
   {
  -    setAttribute(ATTR_CELLPADDING, value);
  +    setAttribute(HTMLAttributes::cellpadding(), value);
   }
   
   DOMString HTMLTableElementImpl::cellSpacing() const
   {
  -    return getAttribute(ATTR_CELLSPACING);
  +    return getAttribute(HTMLAttributes::cellspacing());
   }
   
   void HTMLTableElementImpl::setCellSpacing(const DOMString &value)
   {
  -    setAttribute(ATTR_CELLSPACING, value);
  +    setAttribute(HTMLAttributes::cellspacing(), value);
   }
   
   DOMString HTMLTableElementImpl::frame() const
   {
  -    return getAttribute(ATTR_FRAME);
  +    return getAttribute(HTMLAttributes::frame());
   }
   
   void HTMLTableElementImpl::setFrame(const DOMString &value)
   {
  -    setAttribute(ATTR_FRAME, value);
  +    setAttribute(HTMLAttributes::frame(), value);
   }
   
   DOMString HTMLTableElementImpl::rules() const
   {
  -    return getAttribute(ATTR_RULES);
  +    return getAttribute(HTMLAttributes::rules());
   }
   
   void HTMLTableElementImpl::setRules(const DOMString &value)
   {
  -    setAttribute(ATTR_RULES, value);
  +    setAttribute(HTMLAttributes::rules(), value);
   }
   
   DOMString HTMLTableElementImpl::summary() const
   {
  -    return getAttribute(ATTR_SUMMARY);
  +    return getAttribute(HTMLAttributes::summary());
   }
   
   void HTMLTableElementImpl::setSummary(const DOMString &value)
   {
  -    setAttribute(ATTR_SUMMARY, value);
  +    setAttribute(HTMLAttributes::summary(), value);
   }
   
   DOMString HTMLTableElementImpl::width() const
   {
  -    return getAttribute(ATTR_WIDTH);
  +    return getAttribute(HTMLAttributes::width());
   }
   
   void HTMLTableElementImpl::setWidth(const DOMString &value)
   {
  -    setAttribute(ATTR_WIDTH, value);
  +    setAttribute(HTMLAttributes::width(), value);
   }
   
   // --------------------------------------------------------------------------
   
  -bool HTMLTablePartElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLTablePartElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch(attr) {
  -        case ATTR_BACKGROUND:
  -            result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  -            return false;
  -        case ATTR_BGCOLOR:
  -        case ATTR_BORDERCOLOR:
  -        case ATTR_VALIGN:
  -        case ATTR_HEIGHT:
  -            result = eUniversal;
  -            return false;
  -        case ATTR_ALIGN:
  -            result = eCell; // All table parts will just share in the TD space.
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::background()) {
  +        result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  +        return false;
       }
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +    
  +    if (attrName == HTMLAttributes::bgcolor() ||
  +        attrName == HTMLAttributes::bordercolor() ||
  +        attrName == HTMLAttributes::valign() ||
  +        attrName == HTMLAttributes::height()) {
  +        result = eUniversal;
  +        return false;
  +    }
  +    
  +    if (attrName == HTMLAttributes::align()) {
  +        result = eCell; // All table parts will just share in the TD space.
  +        return false;
  +    }
  +
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLTablePartElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_BGCOLOR:
  -        addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value() );
  -        break;
  -    case ATTR_BACKGROUND:
  -    {
  +    if (attr->name() == HTMLAttributes::bgcolor()) {
  +        addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
  +    } else if (attr->name() == HTMLAttributes::background()) {
           QString url = khtml::parseURL( attr->value() ).string();
           if (!url.isEmpty())
               addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
  -        break;
  -    }
  -    case ATTR_BORDERCOLOR:
  -    {
  +    } else if (attr->name() == HTMLAttributes::bordercolor()) {
           if (!attr->value().isEmpty()) {
               addCSSColor(attr, CSS_PROP_BORDER_COLOR, attr->value());
               addCSSProperty(attr, CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID);
  @@ -774,16 +747,10 @@
               addCSSProperty(attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID);
               addCSSProperty(attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID);
           }
  -        break;
  -    }
  -    case ATTR_VALIGN:
  -    {
  +    } else if (attr->name() == HTMLAttributes::valign()) {
           if (!attr->value().isEmpty())
               addCSSProperty(attr, CSS_PROP_VERTICAL_ALIGN, attr->value());
  -        break;
  -    }
  -    case ATTR_ALIGN:
  -    {
  +    } else if (attr->name() == HTMLAttributes::align()) {
           DOMString v = attr->value();
           if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
               addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
  @@ -795,17 +762,11 @@
               addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
           else
               addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
  -        break;
  -    }
  -    case ATTR_HEIGHT:
  +    } else if (attr->name() == HTMLAttributes::height()) {
           if (!attr->value().isEmpty())
               addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
  -        break;
  -    case ATTR_NOSAVE:
  -	break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   // -------------------------------------------------------------------------
  @@ -894,42 +855,42 @@
   
   DOMString HTMLTableSectionElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLTableSectionElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLTableSectionElementImpl::ch() const
   {
  -    return getAttribute(ATTR_CHAR);
  +    return getAttribute(HTMLAttributes::charAttr());
   }
   
   void HTMLTableSectionElementImpl::setCh(const DOMString &value)
   {
  -    setAttribute(ATTR_CHAR, value);
  +    setAttribute(HTMLAttributes::charAttr(), value);
   }
   
   DOMString HTMLTableSectionElementImpl::chOff() const
   {
  -    return getAttribute(ATTR_CHAROFF);
  +    return getAttribute(HTMLAttributes::charoff());
   }
   
   void HTMLTableSectionElementImpl::setChOff(const DOMString &value)
   {
  -    setAttribute(ATTR_CHAROFF, value);
  +    setAttribute(HTMLAttributes::charoff(), value);
   }
   
   DOMString HTMLTableSectionElementImpl::vAlign() const
   {
  -    return getAttribute(ATTR_VALIGN);
  +    return getAttribute(HTMLAttributes::valign());
   }
   
   void HTMLTableSectionElementImpl::setVAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_VALIGN, value);
  +    setAttribute(HTMLAttributes::valign(), value);
   }
   
   SharedPtr<HTMLCollectionImpl> HTMLTableSectionElementImpl::rows()
  @@ -1061,52 +1022,52 @@
   
   DOMString HTMLTableRowElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLTableRowElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLTableRowElementImpl::bgColor() const
   {
  -    return getAttribute(ATTR_BGCOLOR);
  +    return getAttribute(HTMLAttributes::bgcolor());
   }
   
   void HTMLTableRowElementImpl::setBgColor(const DOMString &value)
   {
  -    setAttribute(ATTR_BGCOLOR, value);
  +    setAttribute(HTMLAttributes::bgcolor(), value);
   }
   
   DOMString HTMLTableRowElementImpl::ch() const
   {
  -    return getAttribute(ATTR_CHAR);
  +    return getAttribute(HTMLAttributes::charAttr());
   }
   
   void HTMLTableRowElementImpl::setCh(const DOMString &value)
   {
  -    setAttribute(ATTR_CHAR, value);
  +    setAttribute(HTMLAttributes::charAttr(), value);
   }
   
   DOMString HTMLTableRowElementImpl::chOff() const
   {
  -    return getAttribute(ATTR_CHAROFF);
  +    return getAttribute(HTMLAttributes::charoff());
   }
   
   void HTMLTableRowElementImpl::setChOff(const DOMString &value)
   {
  -    setAttribute(ATTR_CHAROFF, value);
  +    setAttribute(HTMLAttributes::charoff(), value);
   }
   
   DOMString HTMLTableRowElementImpl::vAlign() const
   {
  -    return getAttribute(ATTR_VALIGN);
  +    return getAttribute(HTMLAttributes::valign());
   }
   
   void HTMLTableRowElementImpl::setVAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_VALIGN, value);
  +    setAttribute(HTMLAttributes::valign(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -1136,61 +1097,51 @@
       return index;
   }
   
  -bool HTMLTableCellElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLTableCellElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch(attr) {
  -        case ATTR_NOWRAP:
  -            result = eUniversal;
  -            return false;
  -        case ATTR_WIDTH:
  -        case ATTR_HEIGHT:
  -            result = eCell; // Because of the quirky behavior of ignoring 0 values, cells are special.
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::nowrap()) {
  +        result = eUniversal;
  +        return false;
  +    }
  +    
  +    if (attrName == HTMLAttributes::width() ||
  +        attrName == HTMLAttributes::height()) {
  +        result = eCell; // Because of the quirky behavior of ignoring 0 values, cells are special.
  +        return false;
       }
  -    return HTMLTablePartElementImpl::mapToEntry(attr, result);
  +
  +    return HTMLTablePartElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLTableCellElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_ROWSPAN:
  +    if (attr->name() == HTMLAttributes::rowspan()) {
           rSpan = !attr->isNull() ? attr->value().toInt() : 1;
           if (rSpan < 1) rSpan = 1;
           if (renderer() && renderer()->isTableCell())
               static_cast<RenderTableCell*>(renderer())->updateFromElement();
  -        break;
  -    case ATTR_COLSPAN:
  +    } else if (attr->name() == HTMLAttributes::colspan()) {
           cSpan = !attr->isNull() ? attr->value().toInt() : 1;
           if (cSpan < 1) cSpan = 1;
           if (renderer() && renderer()->isTableCell())
               static_cast<RenderTableCell*>(renderer())->updateFromElement();
  -        break;
  -    case ATTR_NOWRAP:
  +    } else if (attr->name() == HTMLAttributes::nowrap()) {
           if (!attr->isNull())
               addCSSProperty(attr, CSS_PROP_WHITE_SPACE, CSS_VAL__KHTML_NOWRAP);
  -        break;
  -    case ATTR_WIDTH:
  +    } else if (attr->name() == HTMLAttributes::width()) {
           if (!attr->value().isEmpty()) {
               int widthInt = attr->value().toInt();
               if (widthInt > 0) // width="0" is ignored for compatibility with WinIE.
  -                addCSSLength( attr, CSS_PROP_WIDTH, attr->value() );
  +                addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
           }
  -        break;
  -    case ATTR_HEIGHT:
  +    } else if (attr->name() == HTMLAttributes::height()) {
           if (!attr->value().isEmpty()) {
               int heightInt = attr->value().toInt();
               if (heightInt > 0) // height="0" is ignored for compatibility with WinIE.
  -                addCSSLength( attr, CSS_PROP_HEIGHT, attr->value() );
  +                addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
           }
  -        break;
  -    case ATTR_NOSAVE:
  -	break;
  -    default:
  +    } else
           HTMLTablePartElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   // used by table cells to share style decls created by the enclosing table.
  @@ -1210,137 +1161,137 @@
   
   bool HTMLTableCellElementImpl::isURLAttribute(AttributeImpl *attr) const
   {
  -    return attr->id() == ATTR_BACKGROUND;
  +    return attr->name() == HTMLAttributes::background();
   }
   
   DOMString HTMLTableCellElementImpl::abbr() const
   {
  -    return getAttribute(ATTR_ABBR);
  +    return getAttribute(HTMLAttributes::abbr());
   }
   
   void HTMLTableCellElementImpl::setAbbr(const DOMString &value)
   {
  -    setAttribute(ATTR_ABBR, value);
  +    setAttribute(HTMLAttributes::abbr(), value);
   }
   
   DOMString HTMLTableCellElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLTableCellElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLTableCellElementImpl::axis() const
   {
  -    return getAttribute(ATTR_AXIS);
  +    return getAttribute(HTMLAttributes::axis());
   }
   
   void HTMLTableCellElementImpl::setAxis(const DOMString &value)
   {
  -    setAttribute(ATTR_AXIS, value);
  +    setAttribute(HTMLAttributes::axis(), value);
   }
   
   DOMString HTMLTableCellElementImpl::bgColor() const
   {
  -    return getAttribute(ATTR_BGCOLOR);
  +    return getAttribute(HTMLAttributes::bgcolor());
   }
   
   void HTMLTableCellElementImpl::setBgColor(const DOMString &value)
   {
  -    setAttribute(ATTR_BGCOLOR, value);
  +    setAttribute(HTMLAttributes::bgcolor(), value);
   }
   
   DOMString HTMLTableCellElementImpl::ch() const
   {
  -    return getAttribute(ATTR_CHAR);
  +    return getAttribute(HTMLAttributes::charAttr());
   }
   
   void HTMLTableCellElementImpl::setCh(const DOMString &value)
   {
  -    setAttribute(ATTR_CHAR, value);
  +    setAttribute(HTMLAttributes::charAttr(), value);
   }
   
   DOMString HTMLTableCellElementImpl::chOff() const
   {
  -    return getAttribute(ATTR_CHAROFF);
  +    return getAttribute(HTMLAttributes::charoff());
   }
   
   void HTMLTableCellElementImpl::setChOff(const DOMString &value)
   {
  -    setAttribute(ATTR_CHAROFF, value);
  +    setAttribute(HTMLAttributes::charoff(), value);
   }
   
   void HTMLTableCellElementImpl::setColSpan(long n)
   {
  -    setAttribute(ATTR_COLSPAN, QString::number(n));
  +    setAttribute(HTMLAttributes::colspan(), QString::number(n));
   }
   
   DOMString HTMLTableCellElementImpl::headers() const
   {
  -    return getAttribute(ATTR_HEADERS);
  +    return getAttribute(HTMLAttributes::headers());
   }
   
   void HTMLTableCellElementImpl::setHeaders(const DOMString &value)
   {
  -    setAttribute(ATTR_HEADERS, value);
  +    setAttribute(HTMLAttributes::headers(), value);
   }
   
   DOMString HTMLTableCellElementImpl::height() const
   {
  -    return getAttribute(ATTR_HEIGHT);
  +    return getAttribute(HTMLAttributes::height());
   }
   
   void HTMLTableCellElementImpl::setHeight(const DOMString &value)
   {
  -    setAttribute(ATTR_HEIGHT, value);
  +    setAttribute(HTMLAttributes::height(), value);
   }
   
   bool HTMLTableCellElementImpl::noWrap() const
   {
  -    return !getAttribute(ATTR_NOWRAP).isNull();
  +    return !getAttribute(HTMLAttributes::nowrap()).isNull();
   }
   
   void HTMLTableCellElementImpl::setNoWrap(bool b)
   {
  -    setAttribute(ATTR_NOWRAP, b ? "" : 0);
  +    setAttribute(HTMLAttributes::nowrap(), b ? "" : 0);
   }
   
   void HTMLTableCellElementImpl::setRowSpan(long n)
   {
  -    setAttribute(ATTR_ROWSPAN, QString::number(n));
  +    setAttribute(HTMLAttributes::rowspan(), QString::number(n));
   }
   
   DOMString HTMLTableCellElementImpl::scope() const
   {
  -    return getAttribute(ATTR_SCOPE);
  +    return getAttribute(HTMLAttributes::scope());
   }
   
   void HTMLTableCellElementImpl::setScope(const DOMString &value)
   {
  -    setAttribute(ATTR_SCOPE, value);
  +    setAttribute(HTMLAttributes::scope(), value);
   }
   
   DOMString HTMLTableCellElementImpl::vAlign() const
   {
  -    return getAttribute(ATTR_VALIGN);
  +    return getAttribute(HTMLAttributes::valign());
   }
   
   void HTMLTableCellElementImpl::setVAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_VALIGN, value);
  +    setAttribute(HTMLAttributes::valign(), value);
   }
   
   DOMString HTMLTableCellElementImpl::width() const
   {
  -    return getAttribute(ATTR_WIDTH);
  +    return getAttribute(HTMLAttributes::width());
   }
   
   void HTMLTableCellElementImpl::setWidth(const DOMString &value)
   {
  -    setAttribute(ATTR_WIDTH, value);
  +    setAttribute(HTMLAttributes::width(), value);
   }
   
   // -------------------------------------------------------------------------
  @@ -1351,124 +1302,113 @@
       _span = (tagName.matches(HTMLNames::colgroup()) ? 0 : 1);
   }
   
  -bool HTMLTableColElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLTableColElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    switch(attr) {
  -        case ATTR_WIDTH:
  -            result = eUniversal;
  -            return false;
  -        default:
  -            break;
  +    if (attrName == HTMLAttributes::width()) {
  +        result = eUniversal;
  +        return false;
       }
  -    return HTMLTablePartElementImpl::mapToEntry(attr, result);
  +
  +    return HTMLTablePartElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLTableColElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_SPAN:
  +    if (attr->name() == HTMLAttributes::span()) {
           _span = !attr->isNull() ? attr->value().toInt() : 1;
           if (renderer() && renderer()->isTableCol())
               static_cast<RenderTableCol*>(renderer())->updateFromElement();
  -        break;
  -    case ATTR_WIDTH:
  +    } else if (attr->name() == HTMLAttributes::width()) {
           if (!attr->value().isEmpty())
               addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
  -        break;
  -    default:
  +    } else
           HTMLTablePartElementImpl::parseMappedAttribute(attr);
  -    }
  -
   }
   
   DOMString HTMLTableColElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLTableColElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   DOMString HTMLTableColElementImpl::ch() const
   {
  -    return getAttribute(ATTR_CHAR);
  +    return getAttribute(HTMLAttributes::charAttr());
   }
   
   void HTMLTableColElementImpl::setCh(const DOMString &value)
   {
  -    setAttribute(ATTR_CHAR, value);
  +    setAttribute(HTMLAttributes::charAttr(), value);
   }
   
   DOMString HTMLTableColElementImpl::chOff() const
   {
  -    return getAttribute(ATTR_CHAROFF);
  +    return getAttribute(HTMLAttributes::charoff());
   }
   
   void HTMLTableColElementImpl::setChOff(const DOMString &value)
   {
  -    setAttribute(ATTR_CHAROFF, value);
  +    setAttribute(HTMLAttributes::charoff(), value);
   }
   
   void HTMLTableColElementImpl::setSpan(long n)
   {
  -    setAttribute(ATTR_SPAN, QString::number(n));
  +    setAttribute(HTMLAttributes::span(), QString::number(n));
   }
   
   DOMString HTMLTableColElementImpl::vAlign() const
   {
  -    return getAttribute(ATTR_VALIGN);
  +    return getAttribute(HTMLAttributes::valign());
   }
   
   void HTMLTableColElementImpl::setVAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_VALIGN, value);
  +    setAttribute(HTMLAttributes::valign(), value);
   }
   
   DOMString HTMLTableColElementImpl::width() const
   {
  -    return getAttribute(ATTR_WIDTH);
  +    return getAttribute(HTMLAttributes::width());
   }
   
   void HTMLTableColElementImpl::setWidth(const DOMString &value)
   {
  -    setAttribute(ATTR_WIDTH, value);
  +    setAttribute(HTMLAttributes::width(), value);
   }
   
   // -------------------------------------------------------------------------
   
  -bool HTMLTableCaptionElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool HTMLTableCaptionElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
  -    if (attr == ATTR_ALIGN) {
  +    if (attrName == HTMLAttributes::align()) {
           result = eCaption;
           return false;
       }
  -    return HTMLElementImpl::mapToEntry(attr, result);
  +
  +    return HTMLElementImpl::mapToEntry(attrName, result);
   }
   
   void HTMLTableCaptionElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch(attr->id())
  -    {
  -    case ATTR_ALIGN:
  +    if (attr->name() == HTMLAttributes::align()) {
           if (!attr->value().isEmpty())
               addCSSProperty(attr, CSS_PROP_CAPTION_SIDE, attr->value());
  -        break;
  -    default:
  +    } else
           HTMLElementImpl::parseMappedAttribute(attr);
  -    }
   }
   
   DOMString HTMLTableCaptionElementImpl::align() const
   {
  -    return getAttribute(ATTR_ALIGN);
  +    return getAttribute(HTMLAttributes::align());
   }
   
   void HTMLTableCaptionElementImpl::setAlign(const DOMString &value)
   {
  -    setAttribute(ATTR_ALIGN, value);
  +    setAttribute(HTMLAttributes::align(), value);
   }
   
   }
  
  
  
  1.24      +5 -5      WebCore/khtml/html/html_tableimpl.h
  
  Index: html_tableimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- html_tableimpl.h	14 Jul 2005 20:23:53 -0000	1.23
  +++ html_tableimpl.h	18 Jul 2005 21:44:21 -0000	1.24
  @@ -120,7 +120,7 @@
       virtual NodeImpl *addChild(NodeImpl *child);
       virtual void childrenChanged();
       
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       // Used to obtain either a solid or outset border decl.
  @@ -154,7 +154,7 @@
           : HTMLElementImpl(tagName, doc)
           { }
   
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   };
   
  @@ -258,7 +258,7 @@
       int colSpan() const { return cSpan; }
       int rowSpan() const { return rSpan; }
   
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       // used by table cells to share style decls created by the enclosing table.
  @@ -330,7 +330,7 @@
       void setTable(HTMLTableElementImpl *t) { table = t; }
   
       // overrides
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       long span() const { return _span; }
  @@ -368,7 +368,7 @@
       virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
       virtual int tagPriority() const { return 5; }
       
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void parseMappedAttribute(MappedAttributeImpl *attr);
   
       DOMString align() const;
  
  
  
  1.4       +574 -207  WebCore/khtml/html/htmlnames.cpp
  
  Index: htmlnames.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmlnames.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- htmlnames.cpp	9 Jul 2005 20:19:10 -0000	1.3
  +++ htmlnames.cpp	18 Jul 2005 21:44:21 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * This file is part of the HTML DOM implementation for KDE.
    *
  - * Copyright (C) 2005 Apple Computer, Inc.
  + * Copyright (C) QualifiedName(nullAtom, " 2005 Apple Computer, Inc.
    *
    * This library is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Library General Public
  @@ -32,111 +32,292 @@
   
   // Define a QualifiedName-sized array of pointers to avoid static initialization.
   // Use an array of pointers instead of an array of char in case there is some alignment issue.
  -#define DEFINE_GLOBAL(name) \
  -    void* name ## QName[(sizeof(QualifiedName) + sizeof(void*) - 1) / sizeof(void*)];
  +#define DEFINE_TAG_GLOBAL(name) \
  +    void* name ## Tag[(sizeof(QualifiedName) + sizeof(void*) - 1) / sizeof(void*)];
   
  -DEFINE_GLOBAL(a)
  -DEFINE_GLOBAL(abbr)
  -DEFINE_GLOBAL(acronym)
  -DEFINE_GLOBAL(address)
  -DEFINE_GLOBAL(applet)
  -DEFINE_GLOBAL(area)
  -DEFINE_GLOBAL(b)
  -DEFINE_GLOBAL(base)
  -DEFINE_GLOBAL(basefont)
  -DEFINE_GLOBAL(bdo)
  -DEFINE_GLOBAL(big)
  -DEFINE_GLOBAL(blockquote)
  -DEFINE_GLOBAL(body)
  -DEFINE_GLOBAL(br)
  -DEFINE_GLOBAL(button)
  -DEFINE_GLOBAL(canvas)
  -DEFINE_GLOBAL(caption)
  -DEFINE_GLOBAL(center)
  -DEFINE_GLOBAL(cite)
  -DEFINE_GLOBAL(code)
  -DEFINE_GLOBAL(col)
  -DEFINE_GLOBAL(colgroup)
  -DEFINE_GLOBAL(dd)
  -DEFINE_GLOBAL(del)
  -DEFINE_GLOBAL(dfn)
  -DEFINE_GLOBAL(dir)
  -DEFINE_GLOBAL(div)
  -DEFINE_GLOBAL(dl)
  -DEFINE_GLOBAL(dt)
  -DEFINE_GLOBAL(em)
  -DEFINE_GLOBAL(embed)
  -DEFINE_GLOBAL(fieldset)
  -DEFINE_GLOBAL(font)
  -DEFINE_GLOBAL(form)
  -DEFINE_GLOBAL(frame)
  -DEFINE_GLOBAL(frameset)
  -DEFINE_GLOBAL(head)
  -DEFINE_GLOBAL(h1)
  -DEFINE_GLOBAL(h2)
  -DEFINE_GLOBAL(h3)
  -DEFINE_GLOBAL(h4)
  -DEFINE_GLOBAL(h5)
  -DEFINE_GLOBAL(h6)
  -DEFINE_GLOBAL(hr)
  -DEFINE_GLOBAL(html)
  -DEFINE_GLOBAL(i)
  -DEFINE_GLOBAL(iframe)
  -DEFINE_GLOBAL(img)
  -DEFINE_GLOBAL(input)
  -DEFINE_GLOBAL(ins)
  -DEFINE_GLOBAL(isindex)
  -DEFINE_GLOBAL(kbd)
  -DEFINE_GLOBAL(keygen)
  -DEFINE_GLOBAL(label)
  -DEFINE_GLOBAL(layer)
  -DEFINE_GLOBAL(legend)
  -DEFINE_GLOBAL(li)
  -DEFINE_GLOBAL(link)
  -DEFINE_GLOBAL(map)
  -DEFINE_GLOBAL(marquee)
  -DEFINE_GLOBAL(menu)
  -DEFINE_GLOBAL(meta)
  -DEFINE_GLOBAL(nobr)
  -DEFINE_GLOBAL(noembed)
  -DEFINE_GLOBAL(noframes)
  -DEFINE_GLOBAL(nolayer)
  -DEFINE_GLOBAL(noscript)
  -DEFINE_GLOBAL(object)
  -DEFINE_GLOBAL(ol)
  -DEFINE_GLOBAL(optgroup)
  -DEFINE_GLOBAL(option)
  -DEFINE_GLOBAL(p)
  -DEFINE_GLOBAL(param)
  -DEFINE_GLOBAL(plaintext)
  -DEFINE_GLOBAL(pre)
  -DEFINE_GLOBAL(q)
  -DEFINE_GLOBAL(s)
  -DEFINE_GLOBAL(samp)
  -DEFINE_GLOBAL(script)
  -DEFINE_GLOBAL(select)
  -DEFINE_GLOBAL(small)
  -DEFINE_GLOBAL(span)
  -DEFINE_GLOBAL(strike)
  -DEFINE_GLOBAL(strong)
  -DEFINE_GLOBAL(style)
  -DEFINE_GLOBAL(sub)
  -DEFINE_GLOBAL(sup)
  -DEFINE_GLOBAL(table)
  -DEFINE_GLOBAL(tbody)
  -DEFINE_GLOBAL(td)
  -DEFINE_GLOBAL(textarea)
  -DEFINE_GLOBAL(tfoot)
  -DEFINE_GLOBAL(th)
  -DEFINE_GLOBAL(thead)
  -DEFINE_GLOBAL(title)
  -DEFINE_GLOBAL(tr)
  -DEFINE_GLOBAL(tt)
  -DEFINE_GLOBAL(u)
  -DEFINE_GLOBAL(ul)
  -DEFINE_GLOBAL(var)
  -DEFINE_GLOBAL(wbr)
  -DEFINE_GLOBAL(xmp)
  +DEFINE_TAG_GLOBAL(a)
  +DEFINE_TAG_GLOBAL(abbr)
  +DEFINE_TAG_GLOBAL(acronym)
  +DEFINE_TAG_GLOBAL(address)
  +DEFINE_TAG_GLOBAL(applet)
  +DEFINE_TAG_GLOBAL(area)
  +DEFINE_TAG_GLOBAL(b)
  +DEFINE_TAG_GLOBAL(base)
  +DEFINE_TAG_GLOBAL(basefont)
  +DEFINE_TAG_GLOBAL(bdo)
  +DEFINE_TAG_GLOBAL(big)
  +DEFINE_TAG_GLOBAL(blockquote)
  +DEFINE_TAG_GLOBAL(body)
  +DEFINE_TAG_GLOBAL(br)
  +DEFINE_TAG_GLOBAL(button)
  +DEFINE_TAG_GLOBAL(canvas)
  +DEFINE_TAG_GLOBAL(caption)
  +DEFINE_TAG_GLOBAL(center)
  +DEFINE_TAG_GLOBAL(cite)
  +DEFINE_TAG_GLOBAL(code)
  +DEFINE_TAG_GLOBAL(col)
  +DEFINE_TAG_GLOBAL(colgroup)
  +DEFINE_TAG_GLOBAL(dd)
  +DEFINE_TAG_GLOBAL(del)
  +DEFINE_TAG_GLOBAL(dfn)
  +DEFINE_TAG_GLOBAL(dir)
  +DEFINE_TAG_GLOBAL(div)
  +DEFINE_TAG_GLOBAL(dl)
  +DEFINE_TAG_GLOBAL(dt)
  +DEFINE_TAG_GLOBAL(em)
  +DEFINE_TAG_GLOBAL(embed)
  +DEFINE_TAG_GLOBAL(fieldset)
  +DEFINE_TAG_GLOBAL(font)
  +DEFINE_TAG_GLOBAL(form)
  +DEFINE_TAG_GLOBAL(frame)
  +DEFINE_TAG_GLOBAL(frameset)
  +DEFINE_TAG_GLOBAL(head)
  +DEFINE_TAG_GLOBAL(h1)
  +DEFINE_TAG_GLOBAL(h2)
  +DEFINE_TAG_GLOBAL(h3)
  +DEFINE_TAG_GLOBAL(h4)
  +DEFINE_TAG_GLOBAL(h5)
  +DEFINE_TAG_GLOBAL(h6)
  +DEFINE_TAG_GLOBAL(hr)
  +DEFINE_TAG_GLOBAL(html)
  +DEFINE_TAG_GLOBAL(i)
  +DEFINE_TAG_GLOBAL(iframe)
  +DEFINE_TAG_GLOBAL(img)
  +DEFINE_TAG_GLOBAL(input)
  +DEFINE_TAG_GLOBAL(ins)
  +DEFINE_TAG_GLOBAL(isindex)
  +DEFINE_TAG_GLOBAL(kbd)
  +DEFINE_TAG_GLOBAL(keygen)
  +DEFINE_TAG_GLOBAL(label)
  +DEFINE_TAG_GLOBAL(layer)
  +DEFINE_TAG_GLOBAL(legend)
  +DEFINE_TAG_GLOBAL(li)
  +DEFINE_TAG_GLOBAL(link)
  +DEFINE_TAG_GLOBAL(map)
  +DEFINE_TAG_GLOBAL(marquee)
  +DEFINE_TAG_GLOBAL(menu)
  +DEFINE_TAG_GLOBAL(meta)
  +DEFINE_TAG_GLOBAL(nobr)
  +DEFINE_TAG_GLOBAL(noembed)
  +DEFINE_TAG_GLOBAL(noframes)
  +DEFINE_TAG_GLOBAL(nolayer)
  +DEFINE_TAG_GLOBAL(noscript)
  +DEFINE_TAG_GLOBAL(object)
  +DEFINE_TAG_GLOBAL(ol)
  +DEFINE_TAG_GLOBAL(optgroup)
  +DEFINE_TAG_GLOBAL(option)
  +DEFINE_TAG_GLOBAL(p)
  +DEFINE_TAG_GLOBAL(param)
  +DEFINE_TAG_GLOBAL(plaintext)
  +DEFINE_TAG_GLOBAL(pre)
  +DEFINE_TAG_GLOBAL(q)
  +DEFINE_TAG_GLOBAL(s)
  +DEFINE_TAG_GLOBAL(samp)
  +DEFINE_TAG_GLOBAL(script)
  +DEFINE_TAG_GLOBAL(select)
  +DEFINE_TAG_GLOBAL(small)
  +DEFINE_TAG_GLOBAL(span)
  +DEFINE_TAG_GLOBAL(strike)
  +DEFINE_TAG_GLOBAL(strong)
  +DEFINE_TAG_GLOBAL(style)
  +DEFINE_TAG_GLOBAL(sub)
  +DEFINE_TAG_GLOBAL(sup)
  +DEFINE_TAG_GLOBAL(table)
  +DEFINE_TAG_GLOBAL(tbody)
  +DEFINE_TAG_GLOBAL(td)
  +DEFINE_TAG_GLOBAL(textarea)
  +DEFINE_TAG_GLOBAL(tfoot)
  +DEFINE_TAG_GLOBAL(th)
  +DEFINE_TAG_GLOBAL(thead)
  +DEFINE_TAG_GLOBAL(title)
  +DEFINE_TAG_GLOBAL(tr)
  +DEFINE_TAG_GLOBAL(tt)
  +DEFINE_TAG_GLOBAL(u)
  +DEFINE_TAG_GLOBAL(ul)
  +DEFINE_TAG_GLOBAL(var)
  +DEFINE_TAG_GLOBAL(wbr)
  +DEFINE_TAG_GLOBAL(xmp)
  +
  +// Attribute names.
  +#define DEFINE_ATTR_GLOBAL(name) \
  +    void* name ## Attr[(sizeof(QualifiedName) + sizeof(void*) - 1) / sizeof(void*)];
  +
  +DEFINE_ATTR_GLOBAL(abbr)
  +DEFINE_ATTR_GLOBAL(accept_charset)
  +DEFINE_ATTR_GLOBAL(accept)
  +DEFINE_ATTR_GLOBAL(accesskey)
  +DEFINE_ATTR_GLOBAL(action)
  +DEFINE_ATTR_GLOBAL(align)
  +DEFINE_ATTR_GLOBAL(alink)
  +DEFINE_ATTR_GLOBAL(alt)
  +DEFINE_ATTR_GLOBAL(archive)
  +DEFINE_ATTR_GLOBAL(autocomplete)
  +DEFINE_ATTR_GLOBAL(autosave)
  +DEFINE_ATTR_GLOBAL(axis)
  +DEFINE_ATTR_GLOBAL(background)
  +DEFINE_ATTR_GLOBAL(behavior)
  +DEFINE_ATTR_GLOBAL(bgcolor)
  +DEFINE_ATTR_GLOBAL(bgproperties)
  +DEFINE_ATTR_GLOBAL(border)
  +DEFINE_ATTR_GLOBAL(bordercolor)
  +DEFINE_ATTR_GLOBAL(cellpadding)
  +DEFINE_ATTR_GLOBAL(cellspacing)
  +DEFINE_ATTR_GLOBAL(charAttr)
  +DEFINE_ATTR_GLOBAL(challenge)
  +DEFINE_ATTR_GLOBAL(charoff)
  +DEFINE_ATTR_GLOBAL(charset)
  +DEFINE_ATTR_GLOBAL(checked)
  +DEFINE_ATTR_GLOBAL(cellborder)
  +DEFINE_ATTR_GLOBAL(cite)
  +DEFINE_ATTR_GLOBAL(classAttr)
  +DEFINE_ATTR_GLOBAL(classid)
  +DEFINE_ATTR_GLOBAL(clear)
  +DEFINE_ATTR_GLOBAL(code)
  +DEFINE_ATTR_GLOBAL(codebase)
  +DEFINE_ATTR_GLOBAL(codetype)
  +DEFINE_ATTR_GLOBAL(color)
  +DEFINE_ATTR_GLOBAL(cols)
  +DEFINE_ATTR_GLOBAL(colspan)
  +DEFINE_ATTR_GLOBAL(compact)
  +DEFINE_ATTR_GLOBAL(composite)
  +DEFINE_ATTR_GLOBAL(content)
  +DEFINE_ATTR_GLOBAL(contenteditable)
  +DEFINE_ATTR_GLOBAL(coords)
  +DEFINE_ATTR_GLOBAL(data)
  +DEFINE_ATTR_GLOBAL(datetime)
  +DEFINE_ATTR_GLOBAL(declare)
  +DEFINE_ATTR_GLOBAL(defer)
  +DEFINE_ATTR_GLOBAL(dir)
  +DEFINE_ATTR_GLOBAL(direction)
  +DEFINE_ATTR_GLOBAL(disabled)
  +DEFINE_ATTR_GLOBAL(enctype)
  +DEFINE_ATTR_GLOBAL(face)
  +DEFINE_ATTR_GLOBAL(forAttr)
  +DEFINE_ATTR_GLOBAL(frame)
  +DEFINE_ATTR_GLOBAL(frameborder)
  +DEFINE_ATTR_GLOBAL(headers)
  +DEFINE_ATTR_GLOBAL(height)
  +DEFINE_ATTR_GLOBAL(hidden)
  +DEFINE_ATTR_GLOBAL(href)
  +DEFINE_ATTR_GLOBAL(hreflang)
  +DEFINE_ATTR_GLOBAL(hspace)
  +DEFINE_ATTR_GLOBAL(http_equiv)
  +DEFINE_ATTR_GLOBAL(idAttr)
  +DEFINE_ATTR_GLOBAL(incremental)
  +DEFINE_ATTR_GLOBAL(ismap)
  +DEFINE_ATTR_GLOBAL(keytype)
  +DEFINE_ATTR_GLOBAL(label)
  +DEFINE_ATTR_GLOBAL(lang)
  +DEFINE_ATTR_GLOBAL(language)
  +DEFINE_ATTR_GLOBAL(left)
  +DEFINE_ATTR_GLOBAL(leftmargin)
  +DEFINE_ATTR_GLOBAL(link)
  +DEFINE_ATTR_GLOBAL(longdesc)
  +DEFINE_ATTR_GLOBAL(loop)
  +DEFINE_ATTR_GLOBAL(marginheight)
  +DEFINE_ATTR_GLOBAL(marginwidth)
  +DEFINE_ATTR_GLOBAL(max)
  +DEFINE_ATTR_GLOBAL(maxlength)
  +DEFINE_ATTR_GLOBAL(mayscript)
  +DEFINE_ATTR_GLOBAL(media)
  +DEFINE_ATTR_GLOBAL(method)
  +DEFINE_ATTR_GLOBAL(min)
  +DEFINE_ATTR_GLOBAL(multiple)
  +DEFINE_ATTR_GLOBAL(name)
  +DEFINE_ATTR_GLOBAL(nohref)
  +DEFINE_ATTR_GLOBAL(noresize)
  +DEFINE_ATTR_GLOBAL(noshade)
  +DEFINE_ATTR_GLOBAL(nowrap)
  +DEFINE_ATTR_GLOBAL(object)
  +DEFINE_ATTR_GLOBAL(onabort)
  +DEFINE_ATTR_GLOBAL(onbeforecopy)
  +DEFINE_ATTR_GLOBAL(onbeforecut)
  +DEFINE_ATTR_GLOBAL(onbeforepaste)
  +DEFINE_ATTR_GLOBAL(onblur)
  +DEFINE_ATTR_GLOBAL(onchange)
  +DEFINE_ATTR_GLOBAL(onclick)
  +DEFINE_ATTR_GLOBAL(oncontextmenu)
  +DEFINE_ATTR_GLOBAL(oncopy)
  +DEFINE_ATTR_GLOBAL(oncut)
  +DEFINE_ATTR_GLOBAL(ondblclick)
  +DEFINE_ATTR_GLOBAL(ondrag)
  +DEFINE_ATTR_GLOBAL(ondragend)
  +DEFINE_ATTR_GLOBAL(ondragenter)
  +DEFINE_ATTR_GLOBAL(ondragleave)
  +DEFINE_ATTR_GLOBAL(ondragover)
  +DEFINE_ATTR_GLOBAL(ondragstart)
  +DEFINE_ATTR_GLOBAL(ondrop)
  +DEFINE_ATTR_GLOBAL(onerror)
  +DEFINE_ATTR_GLOBAL(onfocus)
  +DEFINE_ATTR_GLOBAL(oninput)
  +DEFINE_ATTR_GLOBAL(onkeydown)
  +DEFINE_ATTR_GLOBAL(onkeypress)
  +DEFINE_ATTR_GLOBAL(onkeyup)
  +DEFINE_ATTR_GLOBAL(onload)
  +DEFINE_ATTR_GLOBAL(onmousedown)
  +DEFINE_ATTR_GLOBAL(onmousemove)
  +DEFINE_ATTR_GLOBAL(onmouseout)
  +DEFINE_ATTR_GLOBAL(onmouseover)
  +DEFINE_ATTR_GLOBAL(onmouseup)
  +DEFINE_ATTR_GLOBAL(onmousewheel)
  +DEFINE_ATTR_GLOBAL(onpaste)
  +DEFINE_ATTR_GLOBAL(onreset)
  +DEFINE_ATTR_GLOBAL(onresize)
  +DEFINE_ATTR_GLOBAL(onscroll)
  +DEFINE_ATTR_GLOBAL(onsearch)
  +DEFINE_ATTR_GLOBAL(onselect)
  +DEFINE_ATTR_GLOBAL(onselectstart)
  +DEFINE_ATTR_GLOBAL(onsubmit)
  +DEFINE_ATTR_GLOBAL(onunload)
  +DEFINE_ATTR_GLOBAL(pagex)
  +DEFINE_ATTR_GLOBAL(pagey)
  +DEFINE_ATTR_GLOBAL(placeholder)
  +DEFINE_ATTR_GLOBAL(plain)
  +DEFINE_ATTR_GLOBAL(pluginpage)
  +DEFINE_ATTR_GLOBAL(pluginspage)
  +DEFINE_ATTR_GLOBAL(pluginurl)
  +DEFINE_ATTR_GLOBAL(precision)
  +DEFINE_ATTR_GLOBAL(profile)
  +DEFINE_ATTR_GLOBAL(prompt)
  +DEFINE_ATTR_GLOBAL(readonly)
  +DEFINE_ATTR_GLOBAL(rel)
  +DEFINE_ATTR_GLOBAL(results)
  +DEFINE_ATTR_GLOBAL(rev)
  +DEFINE_ATTR_GLOBAL(rows)
  +DEFINE_ATTR_GLOBAL(rowspan)
  +DEFINE_ATTR_GLOBAL(rules)
  +DEFINE_ATTR_GLOBAL(scheme)
  +DEFINE_ATTR_GLOBAL(scope)
  +DEFINE_ATTR_GLOBAL(scrollamount)
  +DEFINE_ATTR_GLOBAL(scrolldelay)
  +DEFINE_ATTR_GLOBAL(scrolling)
  +DEFINE_ATTR_GLOBAL(selected)
  +DEFINE_ATTR_GLOBAL(shape)
  +DEFINE_ATTR_GLOBAL(size)
  +DEFINE_ATTR_GLOBAL(span)
  +DEFINE_ATTR_GLOBAL(src)
  +DEFINE_ATTR_GLOBAL(standby)
  +DEFINE_ATTR_GLOBAL(start)
  +DEFINE_ATTR_GLOBAL(style)
  +DEFINE_ATTR_GLOBAL(summary)
  +DEFINE_ATTR_GLOBAL(tabindex)
  +DEFINE_ATTR_GLOBAL(tableborder)
  +DEFINE_ATTR_GLOBAL(target)
  +DEFINE_ATTR_GLOBAL(text)
  +DEFINE_ATTR_GLOBAL(title)
  +DEFINE_ATTR_GLOBAL(top)
  +DEFINE_ATTR_GLOBAL(topmargin)
  +DEFINE_ATTR_GLOBAL(truespeed)
  +DEFINE_ATTR_GLOBAL(type)
  +DEFINE_ATTR_GLOBAL(usemap)
  +DEFINE_ATTR_GLOBAL(valign)
  +DEFINE_ATTR_GLOBAL(value)
  +DEFINE_ATTR_GLOBAL(valuetype)
  +DEFINE_ATTR_GLOBAL(version)
  +DEFINE_ATTR_GLOBAL(vlink)
  +DEFINE_ATTR_GLOBAL(vspace)
  +DEFINE_ATTR_GLOBAL(width)
  +DEFINE_ATTR_GLOBAL(wrap)
   
   void HTMLNames::init()
   {
  @@ -145,108 +326,294 @@
           // Use placement new to initialize the globals.
           static AtomicString xhtmlNS("http://www.w3.org/1999/xhtml");
           new (&xhtmlNamespaceURIAtom) AtomicString(xhtmlNS);
  -        new (&aQName) QualifiedName(nullAtom, "a", xhtmlNS);
  -        new (&abbrQName) QualifiedName(nullAtom, "abbr", xhtmlNS);
  -        new (&acronymQName) QualifiedName(nullAtom, "acronym", xhtmlNS);
  -        new (&addressQName) QualifiedName(nullAtom, "address", xhtmlNS);
  -        new (&appletQName) QualifiedName(nullAtom, "applet", xhtmlNS);
  -        new (&areaQName) QualifiedName(nullAtom, "area", xhtmlNS);
  -        new (&bQName) QualifiedName(nullAtom, "b", xhtmlNS);
  -        new (&baseQName) QualifiedName(nullAtom, "base", xhtmlNS);
  -        new (&basefontQName) QualifiedName(nullAtom, "basefont", xhtmlNS);
  -        new (&bdoQName) QualifiedName(nullAtom, "bdo", xhtmlNS);
  -        new (&bigQName) QualifiedName(nullAtom, "big", xhtmlNS);
  -        new (&blockquoteQName) QualifiedName(nullAtom, "blockquote", xhtmlNS);
  -        new (&bodyQName) QualifiedName(nullAtom, "body", xhtmlNS);
  -        new (&brQName) QualifiedName(nullAtom, "br", xhtmlNS);
  -        new (&buttonQName) QualifiedName(nullAtom, "button", xhtmlNS);
  -        new (&canvasQName) QualifiedName(nullAtom, "canvas", xhtmlNS);
  -        new (&captionQName) QualifiedName(nullAtom, "caption", xhtmlNS);
  -        new (&centerQName) QualifiedName(nullAtom, "center", xhtmlNS);
  -        new (&citeQName) QualifiedName(nullAtom, "cite", xhtmlNS);
  -        new (&codeQName) QualifiedName(nullAtom, "code", xhtmlNS);
  -        new (&colQName) QualifiedName(nullAtom, "col", xhtmlNS);
  -        new (&colgroupQName) QualifiedName(nullAtom, "colgroup", xhtmlNS);
  -        new (&ddQName) QualifiedName(nullAtom, "dd", xhtmlNS);
  -        new (&delQName) QualifiedName(nullAtom, "del", xhtmlNS);
  -        new (&dfnQName) QualifiedName(nullAtom, "dfn", xhtmlNS);
  -        new (&dirQName) QualifiedName(nullAtom, "dir", xhtmlNS);
  -        new (&divQName) QualifiedName(nullAtom, "div", xhtmlNS);
  -        new (&dlQName) QualifiedName(nullAtom, "dl", xhtmlNS);
  -        new (&dtQName) QualifiedName(nullAtom, "dt", xhtmlNS);
  -        new (&emQName) QualifiedName(nullAtom, "em", xhtmlNS);
  -        new (&embedQName) QualifiedName(nullAtom, "embed", xhtmlNS);
  -        new (&fieldsetQName) QualifiedName(nullAtom, "fieldset", xhtmlNS);
  -        new (&fontQName) QualifiedName(nullAtom, "font", xhtmlNS);
  -        new (&formQName) QualifiedName(nullAtom, "form", xhtmlNS);
  -        new (&frameQName) QualifiedName(nullAtom, "frame", xhtmlNS);
  -        new (&framesetQName) QualifiedName(nullAtom, "frameset", xhtmlNS);
  -        new (&headQName) QualifiedName(nullAtom, "head", xhtmlNS);
  -        new (&h1QName) QualifiedName(nullAtom, "h1", xhtmlNS);
  -        new (&h2QName) QualifiedName(nullAtom, "h2", xhtmlNS);
  -        new (&h3QName) QualifiedName(nullAtom, "h3", xhtmlNS);
  -        new (&h4QName) QualifiedName(nullAtom, "h4", xhtmlNS);
  -        new (&h5QName) QualifiedName(nullAtom, "h5", xhtmlNS);
  -        new (&h6QName) QualifiedName(nullAtom, "h6", xhtmlNS);
  -        new (&hrQName) QualifiedName(nullAtom, "hr", xhtmlNS);
  -        new (&htmlQName) QualifiedName(nullAtom, "html", xhtmlNS);
  -        new (&iQName) QualifiedName(nullAtom, "i", xhtmlNS);
  -        new (&iframeQName) QualifiedName(nullAtom, "iframe", xhtmlNS);
  -        new (&imgQName) QualifiedName(nullAtom, "img", xhtmlNS);
  -        new (&inputQName) QualifiedName(nullAtom, "input", xhtmlNS);
  -        new (&insQName) QualifiedName(nullAtom, "ins", xhtmlNS);
  -        new (&isindexQName) QualifiedName(nullAtom, "isindex", xhtmlNS);
  -        new (&kbdQName) QualifiedName(nullAtom, "kbd", xhtmlNS);
  -        new (&keygenQName) QualifiedName(nullAtom, "keygen", xhtmlNS);
  -        new (&labelQName) QualifiedName(nullAtom, "label", xhtmlNS);
  -        new (&layerQName) QualifiedName(nullAtom, "layer", xhtmlNS);
  -        new (&legendQName) QualifiedName(nullAtom, "legend", xhtmlNS);
  -        new (&liQName) QualifiedName(nullAtom, "li", xhtmlNS);
  -        new (&linkQName) QualifiedName(nullAtom, "link", xhtmlNS);
  -        new (&mapQName) QualifiedName(nullAtom, "map", xhtmlNS);
  -        new (&marqueeQName) QualifiedName(nullAtom, "marquee", xhtmlNS);
  -        new (&menuQName) QualifiedName(nullAtom, "menu", xhtmlNS);
  -        new (&metaQName) QualifiedName(nullAtom, "meta", xhtmlNS);
  -        new (&nobrQName) QualifiedName(nullAtom, "nobr", xhtmlNS);
  -        new (&noembedQName) QualifiedName(nullAtom, "noembed", xhtmlNS);
  -        new (&noframesQName) QualifiedName(nullAtom, "noframes", xhtmlNS);
  -        new (&nolayerQName) QualifiedName(nullAtom, "nolayer", xhtmlNS);
  -        new (&noscriptQName) QualifiedName(nullAtom, "noscript", xhtmlNS);
  -        new (&objectQName) QualifiedName(nullAtom, "object", xhtmlNS);
  -        new (&olQName) QualifiedName(nullAtom, "ol", xhtmlNS);
  -        new (&optgroupQName) QualifiedName(nullAtom, "optgroup", xhtmlNS);
  -        new (&optionQName) QualifiedName(nullAtom, "option", xhtmlNS);
  -        new (&pQName) QualifiedName(nullAtom, "p", xhtmlNS);
  -        new (&paramQName) QualifiedName(nullAtom, "param", xhtmlNS);
  -        new (&plaintextQName) QualifiedName(nullAtom, "plaintext", xhtmlNS);
  -        new (&preQName) QualifiedName(nullAtom, "pre", xhtmlNS);
  -        new (&qQName) QualifiedName(nullAtom, "q", xhtmlNS);
  -        new (&sQName) QualifiedName(nullAtom, "s", xhtmlNS);
  -        new (&sampQName) QualifiedName(nullAtom, "samp", xhtmlNS);
  -        new (&scriptQName) QualifiedName(nullAtom, "script", xhtmlNS);
  -        new (&selectQName) QualifiedName(nullAtom, "select", xhtmlNS);
  -        new (&smallQName) QualifiedName(nullAtom, "small", xhtmlNS);
  -        new (&spanQName) QualifiedName(nullAtom, "span", xhtmlNS);
  -        new (&strikeQName) QualifiedName(nullAtom, "strike", xhtmlNS);
  -        new (&strongQName) QualifiedName(nullAtom, "strong", xhtmlNS);
  -        new (&styleQName) QualifiedName(nullAtom, "style", xhtmlNS);
  -        new (&subQName) QualifiedName(nullAtom, "sub", xhtmlNS);
  -        new (&supQName) QualifiedName(nullAtom, "sup", xhtmlNS);
  -        new (&tableQName) QualifiedName(nullAtom, "table", xhtmlNS);
  -        new (&tbodyQName) QualifiedName(nullAtom, "tbody", xhtmlNS);
  -        new (&tdQName) QualifiedName(nullAtom, "td", xhtmlNS);
  -        new (&textareaQName) QualifiedName(nullAtom, "textarea", xhtmlNS);
  -        new (&tfootQName) QualifiedName(nullAtom, "tfoot", xhtmlNS);
  -        new (&thQName) QualifiedName(nullAtom, "th", xhtmlNS);
  -        new (&theadQName) QualifiedName(nullAtom, "thead", xhtmlNS);
  -        new (&titleQName) QualifiedName(nullAtom, "title", xhtmlNS);
  -        new (&trQName) QualifiedName(nullAtom, "tr", xhtmlNS);
  -        new (&ttQName) QualifiedName(nullAtom, "tt", xhtmlNS);
  -        new (&uQName) QualifiedName(nullAtom, "u", xhtmlNS);
  -        new (&ulQName) QualifiedName(nullAtom, "ul", xhtmlNS);
  -        new (&varQName) QualifiedName(nullAtom, "var", xhtmlNS);
  -        new (&wbrQName) QualifiedName(nullAtom, "wbr", xhtmlNS);
  -        new (&xmpQName) QualifiedName(nullAtom, "xmp", xhtmlNS);
  +        new (&aTag) QualifiedName(nullAtom, "a", xhtmlNS);
  +        new (&abbrTag) QualifiedName(nullAtom, "abbr", xhtmlNS);
  +        new (&acronymTag) QualifiedName(nullAtom, "acronym", xhtmlNS);
  +        new (&addressTag) QualifiedName(nullAtom, "address", xhtmlNS);
  +        new (&appletTag) QualifiedName(nullAtom, "applet", xhtmlNS);
  +        new (&areaTag) QualifiedName(nullAtom, "area", xhtmlNS);
  +        new (&bTag) QualifiedName(nullAtom, "b", xhtmlNS);
  +        new (&baseTag) QualifiedName(nullAtom, "base", xhtmlNS);
  +        new (&basefontTag) QualifiedName(nullAtom, "basefont", xhtmlNS);
  +        new (&bdoTag) QualifiedName(nullAtom, "bdo", xhtmlNS);
  +        new (&bigTag) QualifiedName(nullAtom, "big", xhtmlNS);
  +        new (&blockquoteTag) QualifiedName(nullAtom, "blockquote", xhtmlNS);
  +        new (&bodyTag) QualifiedName(nullAtom, "body", xhtmlNS);
  +        new (&brTag) QualifiedName(nullAtom, "br", xhtmlNS);
  +        new (&buttonTag) QualifiedName(nullAtom, "button", xhtmlNS);
  +        new (&canvasTag) QualifiedName(nullAtom, "canvas", xhtmlNS);
  +        new (&captionTag) QualifiedName(nullAtom, "caption", xhtmlNS);
  +        new (&centerTag) QualifiedName(nullAtom, "center", xhtmlNS);
  +        new (&citeTag) QualifiedName(nullAtom, "cite", xhtmlNS);
  +        new (&codeTag) QualifiedName(nullAtom, "code", xhtmlNS);
  +        new (&colTag) QualifiedName(nullAtom, "col", xhtmlNS);
  +        new (&colgroupTag) QualifiedName(nullAtom, "colgroup", xhtmlNS);
  +        new (&ddTag) QualifiedName(nullAtom, "dd", xhtmlNS);
  +        new (&delTag) QualifiedName(nullAtom, "del", xhtmlNS);
  +        new (&dfnTag) QualifiedName(nullAtom, "dfn", xhtmlNS);
  +        new (&dirTag) QualifiedName(nullAtom, "dir", xhtmlNS);
  +        new (&divTag) QualifiedName(nullAtom, "div", xhtmlNS);
  +        new (&dlTag) QualifiedName(nullAtom, "dl", xhtmlNS);
  +        new (&dtTag) QualifiedName(nullAtom, "dt", xhtmlNS);
  +        new (&emTag) QualifiedName(nullAtom, "em", xhtmlNS);
  +        new (&embedTag) QualifiedName(nullAtom, "embed", xhtmlNS);
  +        new (&fieldsetTag) QualifiedName(nullAtom, "fieldset", xhtmlNS);
  +        new (&fontTag) QualifiedName(nullAtom, "font", xhtmlNS);
  +        new (&formTag) QualifiedName(nullAtom, "form", xhtmlNS);
  +        new (&frameTag) QualifiedName(nullAtom, "frame", xhtmlNS);
  +        new (&framesetTag) QualifiedName(nullAtom, "frameset", xhtmlNS);
  +        new (&headTag) QualifiedName(nullAtom, "head", xhtmlNS);
  +        new (&h1Tag) QualifiedName(nullAtom, "h1", xhtmlNS);
  +        new (&h2Tag) QualifiedName(nullAtom, "h2", xhtmlNS);
  +        new (&h3Tag) QualifiedName(nullAtom, "h3", xhtmlNS);
  +        new (&h4Tag) QualifiedName(nullAtom, "h4", xhtmlNS);
  +        new (&h5Tag) QualifiedName(nullAtom, "h5", xhtmlNS);
  +        new (&h6Tag) QualifiedName(nullAtom, "h6", xhtmlNS);
  +        new (&hrTag) QualifiedName(nullAtom, "hr", xhtmlNS);
  +        new (&htmlTag) QualifiedName(nullAtom, "html", xhtmlNS);
  +        new (&iTag) QualifiedName(nullAtom, "i", xhtmlNS);
  +        new (&iframeTag) QualifiedName(nullAtom, "iframe", xhtmlNS);
  +        new (&imgTag) QualifiedName(nullAtom, "img", xhtmlNS);
  +        new (&inputTag) QualifiedName(nullAtom, "input", xhtmlNS);
  +        new (&insTag) QualifiedName(nullAtom, "ins", xhtmlNS);
  +        new (&isindexTag) QualifiedName(nullAtom, "isindex", xhtmlNS);
  +        new (&kbdTag) QualifiedName(nullAtom, "kbd", xhtmlNS);
  +        new (&keygenTag) QualifiedName(nullAtom, "keygen", xhtmlNS);
  +        new (&labelTag) QualifiedName(nullAtom, "label", xhtmlNS);
  +        new (&layerTag) QualifiedName(nullAtom, "layer", xhtmlNS);
  +        new (&legendTag) QualifiedName(nullAtom, "legend", xhtmlNS);
  +        new (&liTag) QualifiedName(nullAtom, "li", xhtmlNS);
  +        new (&linkTag) QualifiedName(nullAtom, "link", xhtmlNS);
  +        new (&mapTag) QualifiedName(nullAtom, "map", xhtmlNS);
  +        new (&marqueeTag) QualifiedName(nullAtom, "marquee", xhtmlNS);
  +        new (&menuTag) QualifiedName(nullAtom, "menu", xhtmlNS);
  +        new (&metaTag) QualifiedName(nullAtom, "meta", xhtmlNS);
  +        new (&nobrTag) QualifiedName(nullAtom, "nobr", xhtmlNS);
  +        new (&noembedTag) QualifiedName(nullAtom, "noembed", xhtmlNS);
  +        new (&noframesTag) QualifiedName(nullAtom, "noframes", xhtmlNS);
  +        new (&nolayerTag) QualifiedName(nullAtom, "nolayer", xhtmlNS);
  +        new (&noscriptTag) QualifiedName(nullAtom, "noscript", xhtmlNS);
  +        new (&objectTag) QualifiedName(nullAtom, "object", xhtmlNS);
  +        new (&olTag) QualifiedName(nullAtom, "ol", xhtmlNS);
  +        new (&optgroupTag) QualifiedName(nullAtom, "optgroup", xhtmlNS);
  +        new (&optionTag) QualifiedName(nullAtom, "option", xhtmlNS);
  +        new (&pTag) QualifiedName(nullAtom, "p", xhtmlNS);
  +        new (&paramTag) QualifiedName(nullAtom, "param", xhtmlNS);
  +        new (&plaintextTag) QualifiedName(nullAtom, "plaintext", xhtmlNS);
  +        new (&preTag) QualifiedName(nullAtom, "pre", xhtmlNS);
  +        new (&qTag) QualifiedName(nullAtom, "q", xhtmlNS);
  +        new (&sTag) QualifiedName(nullAtom, "s", xhtmlNS);
  +        new (&sampTag) QualifiedName(nullAtom, "samp", xhtmlNS);
  +        new (&scriptTag) QualifiedName(nullAtom, "script", xhtmlNS);
  +        new (&selectTag) QualifiedName(nullAtom, "select", xhtmlNS);
  +        new (&smallTag) QualifiedName(nullAtom, "small", xhtmlNS);
  +        new (&spanTag) QualifiedName(nullAtom, "span", xhtmlNS);
  +        new (&strikeTag) QualifiedName(nullAtom, "strike", xhtmlNS);
  +        new (&strongTag) QualifiedName(nullAtom, "strong", xhtmlNS);
  +        new (&styleTag) QualifiedName(nullAtom, "style", xhtmlNS);
  +        new (&subTag) QualifiedName(nullAtom, "sub", xhtmlNS);
  +        new (&supTag) QualifiedName(nullAtom, "sup", xhtmlNS);
  +        new (&tableTag) QualifiedName(nullAtom, "table", xhtmlNS);
  +        new (&tbodyTag) QualifiedName(nullAtom, "tbody", xhtmlNS);
  +        new (&tdTag) QualifiedName(nullAtom, "td", xhtmlNS);
  +        new (&textareaTag) QualifiedName(nullAtom, "textarea", xhtmlNS);
  +        new (&tfootTag) QualifiedName(nullAtom, "tfoot", xhtmlNS);
  +        new (&thTag) QualifiedName(nullAtom, "th", xhtmlNS);
  +        new (&theadTag) QualifiedName(nullAtom, "thead", xhtmlNS);
  +        new (&titleTag) QualifiedName(nullAtom, "title", xhtmlNS);
  +        new (&trTag) QualifiedName(nullAtom, "tr", xhtmlNS);
  +        new (&ttTag) QualifiedName(nullAtom, "tt", xhtmlNS);
  +        new (&uTag) QualifiedName(nullAtom, "u", xhtmlNS);
  +        new (&ulTag) QualifiedName(nullAtom, "ul", xhtmlNS);
  +        new (&varTag) QualifiedName(nullAtom, "var", xhtmlNS);
  +        new (&wbrTag) QualifiedName(nullAtom, "wbr", xhtmlNS);
  +        new (&xmpTag) QualifiedName(nullAtom, "xmp", xhtmlNS);
  +        initialized = true;
  +    }
  +}
  +
  +void HTMLAttributes::init()
  +{
  +    static bool initialized;
  +    if (!initialized) {
  +        // Attribute names.
  +        new (&abbrAttr) QualifiedName(nullAtom, "abbr", nullAtom);
  +        new (&accept_charsetAttr) QualifiedName(nullAtom, "accept-charset", nullAtom);
  +        new (&acceptAttr) QualifiedName(nullAtom, "accept", nullAtom);
  +        new (&accesskeyAttr) QualifiedName(nullAtom, "accesskey", nullAtom);
  +        new (&actionAttr) QualifiedName(nullAtom, "action", nullAtom);
  +        new (&alignAttr) QualifiedName(nullAtom, "align", nullAtom);
  +        new (&alinkAttr) QualifiedName(nullAtom, "alink", nullAtom);
  +        new (&altAttr) QualifiedName(nullAtom, "alt", nullAtom);
  +        new (&archiveAttr) QualifiedName(nullAtom, "archive", nullAtom);
  +        new (&autocompleteAttr) QualifiedName(nullAtom, "autocomplete", nullAtom);
  +        new (&autosaveAttr) QualifiedName(nullAtom, "autosave", nullAtom);
  +        new (&axisAttr) QualifiedName(nullAtom, "axis", nullAtom);
  +        new (&backgroundAttr) QualifiedName(nullAtom, "background", nullAtom);
  +        new (&behaviorAttr) QualifiedName(nullAtom, "behavior", nullAtom);
  +        new (&bgcolorAttr) QualifiedName(nullAtom, "bgcolor", nullAtom);
  +        new (&bgpropertiesAttr) QualifiedName(nullAtom, "bgproperties", nullAtom);
  +        new (&borderAttr) QualifiedName(nullAtom, "border", nullAtom);
  +        new (&bordercolorAttr) QualifiedName(nullAtom, "bordercolor", nullAtom);
  +        new (&cellpaddingAttr) QualifiedName(nullAtom, "cellpadding", nullAtom);
  +        new (&cellspacingAttr) QualifiedName(nullAtom, "cellspacing", nullAtom);
  +        new (&charAttrAttr) QualifiedName(nullAtom, "char", nullAtom);
  +        new (&challengeAttr) QualifiedName(nullAtom, "challenge", nullAtom);
  +        new (&charoffAttr) QualifiedName(nullAtom, "charoff", nullAtom);
  +        new (&charsetAttr) QualifiedName(nullAtom, "charset", nullAtom);
  +        new (&checkedAttr) QualifiedName(nullAtom, "checked", nullAtom);
  +        new (&cellborderAttr) QualifiedName(nullAtom, "cellborder", nullAtom);
  +        new (&citeAttr) QualifiedName(nullAtom, "cite", nullAtom);
  +        new (&classAttrAttr) QualifiedName(nullAtom, "class", nullAtom);
  +        new (&classidAttr) QualifiedName(nullAtom, "classid", nullAtom);
  +        new (&clearAttr) QualifiedName(nullAtom, "clear", nullAtom);
  +        new (&codeAttr) QualifiedName(nullAtom, "code", nullAtom);
  +        new (&codebaseAttr) QualifiedName(nullAtom, "codebase", nullAtom);
  +        new (&codetypeAttr) QualifiedName(nullAtom, "codetype", nullAtom);
  +        new (&colorAttr) QualifiedName(nullAtom, "color", nullAtom);
  +        new (&colsAttr) QualifiedName(nullAtom, "cols", nullAtom);
  +        new (&colspanAttr) QualifiedName(nullAtom, "colspan", nullAtom);
  +        new (&compactAttr) QualifiedName(nullAtom, "compact", nullAtom);
  +        new (&compositeAttr) QualifiedName(nullAtom, "composite", nullAtom);
  +        new (&contentAttr) QualifiedName(nullAtom, "content", nullAtom);
  +        new (&contenteditableAttr) QualifiedName(nullAtom, "contenteditable", nullAtom);
  +        new (&coordsAttr) QualifiedName(nullAtom, "coords", nullAtom);
  +        new (&dataAttr) QualifiedName(nullAtom, "data", nullAtom);
  +        new (&datetimeAttr) QualifiedName(nullAtom, "datetime", nullAtom);
  +        new (&declareAttr) QualifiedName(nullAtom, "declare", nullAtom);
  +        new (&deferAttr) QualifiedName(nullAtom, "defer", nullAtom);
  +        new (&dirAttr) QualifiedName(nullAtom, "dir", nullAtom);
  +        new (&directionAttr) QualifiedName(nullAtom, "direction", nullAtom);
  +        new (&disabledAttr) QualifiedName(nullAtom, "disabled", nullAtom);
  +        new (&enctypeAttr) QualifiedName(nullAtom, "enctype", nullAtom);
  +        new (&faceAttr) QualifiedName(nullAtom, "face", nullAtom);
  +        new (&forAttrAttr) QualifiedName(nullAtom, "for", nullAtom);
  +        new (&frameAttr) QualifiedName(nullAtom, "frame", nullAtom);
  +        new (&frameborderAttr) QualifiedName(nullAtom, "frameborder", nullAtom);
  +        new (&headersAttr) QualifiedName(nullAtom, "headers", nullAtom);
  +        new (&heightAttr) QualifiedName(nullAtom, "height", nullAtom);
  +        new (&hiddenAttr) QualifiedName(nullAtom, "hidden", nullAtom);
  +        new (&hrefAttr) QualifiedName(nullAtom, "href", nullAtom);
  +        new (&hreflangAttr) QualifiedName(nullAtom, "hreflang", nullAtom);
  +        new (&hspaceAttr) QualifiedName(nullAtom, "hspace", nullAtom);
  +        new (&http_equivAttr) QualifiedName(nullAtom, "http-equiv", nullAtom);
  +        new (&idAttrAttr) QualifiedName(nullAtom, "id", nullAtom);
  +        new (&incrementalAttr) QualifiedName(nullAtom, "incremental", nullAtom);
  +        new (&ismapAttr) QualifiedName(nullAtom, "ismap", nullAtom);
  +        new (&keytypeAttr) QualifiedName(nullAtom, "keytype", nullAtom);
  +        new (&labelAttr) QualifiedName(nullAtom, "label", nullAtom);
  +        new (&langAttr) QualifiedName(nullAtom, "lang", nullAtom);
  +        new (&languageAttr) QualifiedName(nullAtom, "language", nullAtom);
  +        new (&leftAttr) QualifiedName(nullAtom, "left", nullAtom);
  +        new (&leftmarginAttr) QualifiedName(nullAtom, "leftmargin", nullAtom);
  +        new (&linkAttr) QualifiedName(nullAtom, "link", nullAtom);
  +        new (&longdescAttr) QualifiedName(nullAtom, "longdesc", nullAtom);
  +        new (&loopAttr) QualifiedName(nullAtom, "loop", nullAtom);
  +        new (&marginheightAttr) QualifiedName(nullAtom, "marginheight", nullAtom);
  +        new (&marginwidthAttr) QualifiedName(nullAtom, "marginwidth", nullAtom);
  +        new (&maxAttr) QualifiedName(nullAtom, "max", nullAtom);
  +        new (&maxlengthAttr) QualifiedName(nullAtom, "maxlength", nullAtom);
  +        new (&mayscriptAttr) QualifiedName(nullAtom, "mayscript", nullAtom);
  +        new (&mediaAttr) QualifiedName(nullAtom, "media", nullAtom);
  +        new (&methodAttr) QualifiedName(nullAtom, "method", nullAtom);
  +        new (&minAttr) QualifiedName(nullAtom, "min", nullAtom);
  +        new (&multipleAttr) QualifiedName(nullAtom, "multiple", nullAtom);
  +        new (&nameAttr) QualifiedName(nullAtom, "name", nullAtom);
  +        new (&nohrefAttr) QualifiedName(nullAtom, "nohref", nullAtom);
  +        new (&noresizeAttr) QualifiedName(nullAtom, "noresize", nullAtom);
  +        new (&noshadeAttr) QualifiedName(nullAtom, "noshade", nullAtom);
  +        new (&nowrapAttr) QualifiedName(nullAtom, "nowrap", nullAtom);
  +        new (&objectAttr) QualifiedName(nullAtom, "object", nullAtom);
  +        new (&onabortAttr) QualifiedName(nullAtom, "onabort", nullAtom);
  +        new (&onbeforecopyAttr) QualifiedName(nullAtom, "onbeforecopy", nullAtom);
  +        new (&onbeforecutAttr) QualifiedName(nullAtom, "onbeforecut", nullAtom);
  +        new (&onbeforepasteAttr) QualifiedName(nullAtom, "onbeforepaste", nullAtom);
  +        new (&onblurAttr) QualifiedName(nullAtom, "onblur", nullAtom);
  +        new (&onchangeAttr) QualifiedName(nullAtom, "onchange", nullAtom);
  +        new (&onclickAttr) QualifiedName(nullAtom, "onclick", nullAtom);
  +        new (&oncontextmenuAttr) QualifiedName(nullAtom, "oncontextmenu", nullAtom);
  +        new (&oncopyAttr) QualifiedName(nullAtom, "oncopy", nullAtom);
  +        new (&oncutAttr) QualifiedName(nullAtom, "oncut", nullAtom);
  +        new (&ondblclickAttr) QualifiedName(nullAtom, "ondblclick", nullAtom);
  +        new (&ondragAttr) QualifiedName(nullAtom, "ondrag", nullAtom);
  +        new (&ondragendAttr) QualifiedName(nullAtom, "ondragend", nullAtom);
  +        new (&ondragenterAttr) QualifiedName(nullAtom, "ondragenter", nullAtom);
  +        new (&ondragleaveAttr) QualifiedName(nullAtom, "ondragleave", nullAtom);
  +        new (&ondragoverAttr) QualifiedName(nullAtom, "ondragover", nullAtom);
  +        new (&ondragstartAttr) QualifiedName(nullAtom, "ondragstart", nullAtom);
  +        new (&ondropAttr) QualifiedName(nullAtom, "ondrop", nullAtom);
  +        new (&onerrorAttr) QualifiedName(nullAtom, "onerror", nullAtom);
  +        new (&onfocusAttr) QualifiedName(nullAtom, "onfocus", nullAtom);
  +        new (&oninputAttr) QualifiedName(nullAtom, "oninput", nullAtom);
  +        new (&onkeydownAttr) QualifiedName(nullAtom, "onkeydown", nullAtom);
  +        new (&onkeypressAttr) QualifiedName(nullAtom, "onkeypress", nullAtom);
  +        new (&onkeyupAttr) QualifiedName(nullAtom, "onkeyup", nullAtom);
  +        new (&onloadAttr) QualifiedName(nullAtom, "onload", nullAtom);
  +        new (&onmousedownAttr) QualifiedName(nullAtom, "onmousedown", nullAtom);
  +        new (&onmousemoveAttr) QualifiedName(nullAtom, "onmousemove", nullAtom);
  +        new (&onmouseoutAttr) QualifiedName(nullAtom, "onmouseout", nullAtom);
  +        new (&onmouseoverAttr) QualifiedName(nullAtom, "onmouseover", nullAtom);
  +        new (&onmouseupAttr) QualifiedName(nullAtom, "onmouseup", nullAtom);
  +        new (&onmousewheelAttr) QualifiedName(nullAtom, "onmousewheel", nullAtom);
  +        new (&onpasteAttr) QualifiedName(nullAtom, "onpaste", nullAtom);
  +        new (&onresetAttr) QualifiedName(nullAtom, "onreset", nullAtom);
  +        new (&onresizeAttr) QualifiedName(nullAtom, "onresize", nullAtom);
  +        new (&onscrollAttr) QualifiedName(nullAtom, "onscroll", nullAtom);
  +        new (&onsearchAttr) QualifiedName(nullAtom, "onsearch", nullAtom);
  +        new (&onselectAttr) QualifiedName(nullAtom, "onselect", nullAtom);
  +        new (&onselectstartAttr) QualifiedName(nullAtom, "onselectstart", nullAtom);
  +        new (&onsubmitAttr) QualifiedName(nullAtom, "onsubmit", nullAtom);
  +        new (&onunloadAttr) QualifiedName(nullAtom, "onunload", nullAtom);
  +        new (&pagexAttr) QualifiedName(nullAtom, "pagex", nullAtom);
  +        new (&pageyAttr) QualifiedName(nullAtom, "pagey", nullAtom);
  +        new (&placeholderAttr) QualifiedName(nullAtom, "placeholder", nullAtom);
  +        new (&plainAttr) QualifiedName(nullAtom, "plain", nullAtom);
  +        new (&pluginpageAttr) QualifiedName(nullAtom, "pluginpage", nullAtom);
  +        new (&pluginspageAttr) QualifiedName(nullAtom, "pluginspage", nullAtom);
  +        new (&pluginurlAttr) QualifiedName(nullAtom, "pluginurl", nullAtom);
  +        new (&precisionAttr) QualifiedName(nullAtom, "precision", nullAtom);
  +        new (&profileAttr) QualifiedName(nullAtom, "profile", nullAtom);
  +        new (&promptAttr) QualifiedName(nullAtom, "prompt", nullAtom);
  +        new (&readonlyAttr) QualifiedName(nullAtom, "readonly", nullAtom);
  +        new (&relAttr) QualifiedName(nullAtom, "rel", nullAtom);
  +        new (&resultsAttr) QualifiedName(nullAtom, "results", nullAtom);
  +        new (&revAttr) QualifiedName(nullAtom, "rev", nullAtom);
  +        new (&rowsAttr) QualifiedName(nullAtom, "rows", nullAtom);
  +        new (&rowspanAttr) QualifiedName(nullAtom, "rowspan", nullAtom);
  +        new (&rulesAttr) QualifiedName(nullAtom, "rules", nullAtom);
  +        new (&schemeAttr) QualifiedName(nullAtom, "scheme", nullAtom);
  +        new (&scopeAttr) QualifiedName(nullAtom, "scope", nullAtom);
  +        new (&scrollamountAttr) QualifiedName(nullAtom, "scrollamount", nullAtom);
  +        new (&scrolldelayAttr) QualifiedName(nullAtom, "scrolldelay", nullAtom);
  +        new (&scrollingAttr) QualifiedName(nullAtom, "scrolling", nullAtom);
  +        new (&selectedAttr) QualifiedName(nullAtom, "selected", nullAtom);
  +        new (&shapeAttr) QualifiedName(nullAtom, "shape", nullAtom);
  +        new (&sizeAttr) QualifiedName(nullAtom, "size", nullAtom);
  +        new (&spanAttr) QualifiedName(nullAtom, "span", nullAtom);
  +        new (&srcAttr) QualifiedName(nullAtom, "src", nullAtom);
  +        new (&standbyAttr) QualifiedName(nullAtom, "standby", nullAtom);
  +        new (&startAttr) QualifiedName(nullAtom, "start", nullAtom);
  +        new (&styleAttr) QualifiedName(nullAtom, "style", nullAtom);
  +        new (&summaryAttr) QualifiedName(nullAtom, "summary", nullAtom);
  +        new (&tabindexAttr) QualifiedName(nullAtom, "tabindex", nullAtom);
  +        new (&tableborderAttr) QualifiedName(nullAtom, "tableborder", nullAtom);
  +        new (&targetAttr) QualifiedName(nullAtom, "target", nullAtom);
  +        new (&textAttr) QualifiedName(nullAtom, "text", nullAtom);
  +        new (&titleAttr) QualifiedName(nullAtom, "title", nullAtom);
  +        new (&topAttr) QualifiedName(nullAtom, "top", nullAtom);
  +        new (&topmarginAttr) QualifiedName(nullAtom, "topmargin", nullAtom);
  +        new (&truespeedAttr) QualifiedName(nullAtom, "truespeed", nullAtom);
  +        new (&typeAttr) QualifiedName(nullAtom, "type", nullAtom);
  +        new (&usemapAttr) QualifiedName(nullAtom, "usemap", nullAtom);
  +        new (&valignAttr) QualifiedName(nullAtom, "valign", nullAtom);
  +        new (&valueAttr) QualifiedName(nullAtom, "value", nullAtom);
  +        new (&valuetypeAttr) QualifiedName(nullAtom, "valuetype", nullAtom);
  +        new (&versionAttr) QualifiedName(nullAtom, "version", nullAtom);
  +        new (&vlinkAttr) QualifiedName(nullAtom, "vlink", nullAtom);
  +        new (&vspaceAttr) QualifiedName(nullAtom, "vspace", nullAtom);
  +        new (&widthAttr) QualifiedName(nullAtom, "width", nullAtom);
  +        new (&wrapAttr) QualifiedName(nullAtom, "wrap", nullAtom);
  +
           initialized = true;
       }
   }
  
  
  
  1.4       +578 -206  WebCore/khtml/html/htmlnames.h
  
  Index: htmlnames.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmlnames.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- htmlnames.h	9 Jul 2005 20:19:11 -0000	1.3
  +++ htmlnames.h	18 Jul 2005 21:44:21 -0000	1.4
  @@ -33,112 +33,292 @@
   // Define external global variables for all HTML names above.
   #if !KHTML_HTMLNAMES_HIDE_GLOBALS
       extern const AtomicString  xhtmlNamespaceURIAtom;
  -    extern const QualifiedName aQName;
  -    extern const QualifiedName abbrQName;
  -    extern const QualifiedName acronymQName;
  -    extern const QualifiedName addressQName;
  -    extern const QualifiedName appletQName;
  -    extern const QualifiedName areaQName;
  -    extern const QualifiedName bQName;
  -    extern const QualifiedName baseQName;
  -    extern const QualifiedName basefontQName;
  -    extern const QualifiedName bdoQName;
  -    extern const QualifiedName bigQName;
  -    extern const QualifiedName blockquoteQName;
  -    extern const QualifiedName bodyQName;
  -    extern const QualifiedName brQName;
  -    extern const QualifiedName buttonQName;
  -    extern const QualifiedName canvasQName;
  -    extern const QualifiedName captionQName;
  -    extern const QualifiedName centerQName;
  -    extern const QualifiedName citeQName;
  -    extern const QualifiedName codeQName;
  -    extern const QualifiedName colQName;
  -    extern const QualifiedName colgroupQName;
  -    extern const QualifiedName ddQName;
  -    extern const QualifiedName delQName;
  -    extern const QualifiedName dfnQName;
  -    extern const QualifiedName dirQName;
  -    extern const QualifiedName divQName;
  -    extern const QualifiedName dlQName;
  -    extern const QualifiedName dtQName;
  -    extern const QualifiedName emQName;
  -    extern const QualifiedName embedQName;
  -    extern const QualifiedName fieldsetQName;
  -    extern const QualifiedName fontQName;
  -    extern const QualifiedName formQName;
  -    extern const QualifiedName frameQName;
  -    extern const QualifiedName framesetQName;
  -    extern const QualifiedName headQName;
  -    extern const QualifiedName h1QName;
  -    extern const QualifiedName h2QName;
  -    extern const QualifiedName h3QName;
  -    extern const QualifiedName h4QName;
  -    extern const QualifiedName h5QName;
  -    extern const QualifiedName h6QName;
  -    extern const QualifiedName hrQName;
  -    extern const QualifiedName htmlQName;
  -    extern const QualifiedName iQName;
  -    extern const QualifiedName iframeQName;
  -    extern const QualifiedName imgQName;
  -    extern const QualifiedName inputQName;
  -    extern const QualifiedName insQName;
  -    extern const QualifiedName isindexQName;
  -    extern const QualifiedName kbdQName;
  -    extern const QualifiedName keygenQName;
  -    extern const QualifiedName labelQName;
  -    extern const QualifiedName layerQName;
  -    extern const QualifiedName legendQName;
  -    extern const QualifiedName liQName;
  -    extern const QualifiedName linkQName;
  -    extern const QualifiedName mapQName;
  -    extern const QualifiedName marqueeQName;
  -    extern const QualifiedName menuQName;
  -    extern const QualifiedName metaQName;
  -    extern const QualifiedName nobrQName;
  -    extern const QualifiedName noembedQName;
  -    extern const QualifiedName noframesQName;
  -    extern const QualifiedName nolayerQName;
  -    extern const QualifiedName noscriptQName;
  -    extern const QualifiedName objectQName;
  -    extern const QualifiedName olQName;
  -    extern const QualifiedName optgroupQName;
  -    extern const QualifiedName optionQName;
  -    extern const QualifiedName pQName;
  -    extern const QualifiedName paramQName;
  -    extern const QualifiedName plaintextQName;
  -    extern const QualifiedName preQName;
  -    extern const QualifiedName qQName;
  -    extern const QualifiedName sQName;
  -    extern const QualifiedName sampQName;
  -    extern const QualifiedName scriptQName;
  -    extern const QualifiedName selectQName;
  -    extern const QualifiedName smallQName;
  -    extern const QualifiedName spanQName;
  -    extern const QualifiedName strikeQName;
  -    extern const QualifiedName strongQName;
  -    extern const QualifiedName styleQName;
  -    extern const QualifiedName subQName;
  -    extern const QualifiedName supQName;
  -    extern const QualifiedName tableQName;
  -    extern const QualifiedName tbodyQName;
  -    extern const QualifiedName tdQName;
  -    extern const QualifiedName textareaQName;
  -    extern const QualifiedName tfootQName;
  -    extern const QualifiedName thQName;
  -    extern const QualifiedName theadQName;
  -    extern const QualifiedName titleQName;
  -    extern const QualifiedName trQName;
  -    extern const QualifiedName ttQName;
  -    extern const QualifiedName uQName;
  -    extern const QualifiedName ulQName;
  -    extern const QualifiedName varQName;
  -    extern const QualifiedName wbrQName;
  -    extern const QualifiedName xmpQName;
  +    extern const QualifiedName aTag;
  +    extern const QualifiedName abbrTag;
  +    extern const QualifiedName acronymTag;
  +    extern const QualifiedName addressTag;
  +    extern const QualifiedName appletTag;
  +    extern const QualifiedName areaTag;
  +    extern const QualifiedName bTag;
  +    extern const QualifiedName baseTag;
  +    extern const QualifiedName basefontTag;
  +    extern const QualifiedName bdoTag;
  +    extern const QualifiedName bigTag;
  +    extern const QualifiedName blockquoteTag;
  +    extern const QualifiedName bodyTag;
  +    extern const QualifiedName brTag;
  +    extern const QualifiedName buttonTag;
  +    extern const QualifiedName canvasTag;
  +    extern const QualifiedName captionTag;
  +    extern const QualifiedName centerTag;
  +    extern const QualifiedName citeTag;
  +    extern const QualifiedName codeTag;
  +    extern const QualifiedName colTag;
  +    extern const QualifiedName colgroupTag;
  +    extern const QualifiedName ddTag;
  +    extern const QualifiedName delTag;
  +    extern const QualifiedName dfnTag;
  +    extern const QualifiedName dirTag;
  +    extern const QualifiedName divTag;
  +    extern const QualifiedName dlTag;
  +    extern const QualifiedName dtTag;
  +    extern const QualifiedName emTag;
  +    extern const QualifiedName embedTag;
  +    extern const QualifiedName fieldsetTag;
  +    extern const QualifiedName fontTag;
  +    extern const QualifiedName formTag;
  +    extern const QualifiedName frameTag;
  +    extern const QualifiedName framesetTag;
  +    extern const QualifiedName headTag;
  +    extern const QualifiedName h1Tag;
  +    extern const QualifiedName h2Tag;
  +    extern const QualifiedName h3Tag;
  +    extern const QualifiedName h4Tag;
  +    extern const QualifiedName h5Tag;
  +    extern const QualifiedName h6Tag;
  +    extern const QualifiedName hrTag;
  +    extern const QualifiedName htmlTag;
  +    extern const QualifiedName iTag;
  +    extern const QualifiedName iframeTag;
  +    extern const QualifiedName imgTag;
  +    extern const QualifiedName inputTag;
  +    extern const QualifiedName insTag;
  +    extern const QualifiedName isindexTag;
  +    extern const QualifiedName kbdTag;
  +    extern const QualifiedName keygenTag;
  +    extern const QualifiedName labelTag;
  +    extern const QualifiedName layerTag;
  +    extern const QualifiedName legendTag;
  +    extern const QualifiedName liTag;
  +    extern const QualifiedName linkTag;
  +    extern const QualifiedName mapTag;
  +    extern const QualifiedName marqueeTag;
  +    extern const QualifiedName menuTag;
  +    extern const QualifiedName metaTag;
  +    extern const QualifiedName nobrTag;
  +    extern const QualifiedName noembedTag;
  +    extern const QualifiedName noframesTag;
  +    extern const QualifiedName nolayerTag;
  +    extern const QualifiedName noscriptTag;
  +    extern const QualifiedName objectTag;
  +    extern const QualifiedName olTag;
  +    extern const QualifiedName optgroupTag;
  +    extern const QualifiedName optionTag;
  +    extern const QualifiedName pTag;
  +    extern const QualifiedName paramTag;
  +    extern const QualifiedName plaintextTag;
  +    extern const QualifiedName preTag;
  +    extern const QualifiedName qTag;
  +    extern const QualifiedName sTag;
  +    extern const QualifiedName sampTag;
  +    extern const QualifiedName scriptTag;
  +    extern const QualifiedName selectTag;
  +    extern const QualifiedName smallTag;
  +    extern const QualifiedName spanTag;
  +    extern const QualifiedName strikeTag;
  +    extern const QualifiedName strongTag;
  +    extern const QualifiedName styleTag;
  +    extern const QualifiedName subTag;
  +    extern const QualifiedName supTag;
  +    extern const QualifiedName tableTag;
  +    extern const QualifiedName tbodyTag;
  +    extern const QualifiedName tdTag;
  +    extern const QualifiedName textareaTag;
  +    extern const QualifiedName tfootTag;
  +    extern const QualifiedName thTag;
  +    extern const QualifiedName theadTag;
  +    extern const QualifiedName titleTag;
  +    extern const QualifiedName trTag;
  +    extern const QualifiedName ttTag;
  +    extern const QualifiedName uTag;
  +    extern const QualifiedName ulTag;
  +    extern const QualifiedName varTag;
  +    extern const QualifiedName wbrTag;
  +    extern const QualifiedName xmpTag;
  +
  +    // Attributes
  +    extern const QualifiedName abbrAttr;
  +    extern const QualifiedName accept_charsetAttr;
  +    extern const QualifiedName acceptAttr;
  +    extern const QualifiedName accesskeyAttr;
  +    extern const QualifiedName actionAttr;
  +    extern const QualifiedName alignAttr;
  +    extern const QualifiedName alinkAttr;
  +    extern const QualifiedName altAttr;
  +    extern const QualifiedName archiveAttr;
  +    extern const QualifiedName autocompleteAttr;
  +    extern const QualifiedName autosaveAttr;
  +    extern const QualifiedName axisAttr;
  +    extern const QualifiedName backgroundAttr;
  +    extern const QualifiedName behaviorAttr;
  +    extern const QualifiedName bgcolorAttr;
  +    extern const QualifiedName bgpropertiesAttr;
  +    extern const QualifiedName borderAttr;
  +    extern const QualifiedName bordercolorAttr;
  +    extern const QualifiedName cellpaddingAttr;
  +    extern const QualifiedName cellspacingAttr;
  +    extern const QualifiedName charAttrAttr;
  +    extern const QualifiedName challengeAttr;
  +    extern const QualifiedName charoffAttr;
  +    extern const QualifiedName charsetAttr;
  +    extern const QualifiedName checkedAttr;
  +    extern const QualifiedName cellborderAttr;
  +    extern const QualifiedName citeAttr;
  +    extern const QualifiedName classAttrAttr;
  +    extern const QualifiedName classidAttr;
  +    extern const QualifiedName clearAttr;
  +    extern const QualifiedName codeAttr;
  +    extern const QualifiedName codebaseAttr;
  +    extern const QualifiedName codetypeAttr;
  +    extern const QualifiedName colorAttr;
  +    extern const QualifiedName colsAttr;
  +    extern const QualifiedName colspanAttr;
  +    extern const QualifiedName compactAttr;
  +    extern const QualifiedName compositeAttr;
  +    extern const QualifiedName contentAttr;
  +    extern const QualifiedName contenteditableAttr;
  +    extern const QualifiedName coordsAttr;
  +    extern const QualifiedName dataAttr;
  +    extern const QualifiedName datetimeAttr;
  +    extern const QualifiedName declareAttr;
  +    extern const QualifiedName deferAttr;
  +    extern const QualifiedName dirAttr;
  +    extern const QualifiedName directionAttr;
  +    extern const QualifiedName disabledAttr;
  +    extern const QualifiedName enctypeAttr;
  +    extern const QualifiedName faceAttr;
  +    extern const QualifiedName forAttrAttr;
  +    extern const QualifiedName frameAttr;
  +    extern const QualifiedName frameborderAttr;
  +    extern const QualifiedName headersAttr;
  +    extern const QualifiedName heightAttr;
  +    extern const QualifiedName hiddenAttr;
  +    extern const QualifiedName hrefAttr;
  +    extern const QualifiedName hreflangAttr;
  +    extern const QualifiedName hspaceAttr;
  +    extern const QualifiedName http_equivAttr;
  +    extern const QualifiedName idAttrAttr;
  +    extern const QualifiedName incrementalAttr;
  +    extern const QualifiedName ismapAttr;
  +    extern const QualifiedName keytypeAttr;
  +    extern const QualifiedName labelAttr;
  +    extern const QualifiedName langAttr;
  +    extern const QualifiedName languageAttr;
  +    extern const QualifiedName leftAttr;
  +    extern const QualifiedName leftmarginAttr;
  +    extern const QualifiedName linkAttr;
  +    extern const QualifiedName longdescAttr;
  +    extern const QualifiedName loopAttr;
  +    extern const QualifiedName marginheightAttr;
  +    extern const QualifiedName marginwidthAttr;
  +    extern const QualifiedName maxAttr;
  +    extern const QualifiedName maxlengthAttr;
  +    extern const QualifiedName mayscriptAttr;
  +    extern const QualifiedName mediaAttr;
  +    extern const QualifiedName methodAttr;
  +    extern const QualifiedName minAttr;
  +    extern const QualifiedName multipleAttr;
  +    extern const QualifiedName nameAttr;
  +    extern const QualifiedName nohrefAttr;
  +    extern const QualifiedName noresizeAttr;
  +    extern const QualifiedName noshadeAttr;
  +    extern const QualifiedName nowrapAttr;
  +    extern const QualifiedName objectAttr;
  +    extern const QualifiedName onabortAttr;
  +    extern const QualifiedName onbeforecopyAttr;
  +    extern const QualifiedName onbeforecutAttr;
  +    extern const QualifiedName onbeforepasteAttr;
  +    extern const QualifiedName onblurAttr;
  +    extern const QualifiedName onchangeAttr;
  +    extern const QualifiedName onclickAttr;
  +    extern const QualifiedName oncontextmenuAttr;
  +    extern const QualifiedName oncopyAttr;
  +    extern const QualifiedName oncutAttr;
  +    extern const QualifiedName ondblclickAttr;
  +    extern const QualifiedName ondragAttr;
  +    extern const QualifiedName ondragendAttr;
  +    extern const QualifiedName ondragenterAttr;
  +    extern const QualifiedName ondragleaveAttr;
  +    extern const QualifiedName ondragoverAttr;
  +    extern const QualifiedName ondragstartAttr;
  +    extern const QualifiedName ondropAttr;
  +    extern const QualifiedName onerrorAttr;
  +    extern const QualifiedName onfocusAttr;
  +    extern const QualifiedName oninputAttr;
  +    extern const QualifiedName onkeydownAttr;
  +    extern const QualifiedName onkeypressAttr;
  +    extern const QualifiedName onkeyupAttr;
  +    extern const QualifiedName onloadAttr;
  +    extern const QualifiedName onmousedownAttr;
  +    extern const QualifiedName onmousemoveAttr;
  +    extern const QualifiedName onmouseoutAttr;
  +    extern const QualifiedName onmouseoverAttr;
  +    extern const QualifiedName onmouseupAttr;
  +    extern const QualifiedName onmousewheelAttr;
  +    extern const QualifiedName onpasteAttr;
  +    extern const QualifiedName onresetAttr;
  +    extern const QualifiedName onresizeAttr;
  +    extern const QualifiedName onscrollAttr;
  +    extern const QualifiedName onsearchAttr;
  +    extern const QualifiedName onselectAttr;
  +    extern const QualifiedName onselectstartAttr;
  +    extern const QualifiedName onsubmitAttr;
  +    extern const QualifiedName onunloadAttr;
  +    extern const QualifiedName pagexAttr;
  +    extern const QualifiedName pageyAttr;
  +    extern const QualifiedName placeholderAttr;
  +    extern const QualifiedName plainAttr;
  +    extern const QualifiedName pluginpageAttr;
  +    extern const QualifiedName pluginspageAttr;
  +    extern const QualifiedName pluginurlAttr;
  +    extern const QualifiedName precisionAttr;
  +    extern const QualifiedName profileAttr;
  +    extern const QualifiedName promptAttr;
  +    extern const QualifiedName readonlyAttr;
  +    extern const QualifiedName relAttr;
  +    extern const QualifiedName resultsAttr;
  +    extern const QualifiedName revAttr;
  +    extern const QualifiedName rowsAttr;
  +    extern const QualifiedName rowspanAttr;
  +    extern const QualifiedName rulesAttr;
  +    extern const QualifiedName schemeAttr;
  +    extern const QualifiedName scopeAttr;
  +    extern const QualifiedName scrollamountAttr;
  +    extern const QualifiedName scrolldelayAttr;
  +    extern const QualifiedName scrollingAttr;
  +    extern const QualifiedName selectedAttr;
  +    extern const QualifiedName shapeAttr;
  +    extern const QualifiedName sizeAttr;
  +    extern const QualifiedName spanAttr;
  +    extern const QualifiedName srcAttr;
  +    extern const QualifiedName standbyAttr;
  +    extern const QualifiedName startAttr;
  +    extern const QualifiedName styleAttr;
  +    extern const QualifiedName summaryAttr;
  +    extern const QualifiedName tabindexAttr;
  +    extern const QualifiedName tableborderAttr;
  +    extern const QualifiedName targetAttr;
  +    extern const QualifiedName textAttr;
  +    extern const QualifiedName titleAttr;
  +    extern const QualifiedName topAttr;
  +    extern const QualifiedName topmarginAttr;
  +    extern const QualifiedName truespeedAttr;
  +    extern const QualifiedName typeAttr;
  +    extern const QualifiedName usemapAttr;
  +    extern const QualifiedName valignAttr;
  +    extern const QualifiedName valueAttr;
  +    extern const QualifiedName valuetypeAttr;
  +    extern const QualifiedName versionAttr;
  +    extern const QualifiedName vlinkAttr;
  +    extern const QualifiedName vspaceAttr;
  +    extern const QualifiedName widthAttr;
  +    extern const QualifiedName wrapAttr;
   
   #endif
   
   // FIXME: Make this a namespace instead of a class.
  +// FIXME: Rename this to HTMLTags
  +// FIXME: Just make the xhtmlNamespaceURI() a global outside of any class
   class HTMLNames
   {
   public:
  @@ -147,113 +327,305 @@
       static const AtomicString& xhtmlNamespaceURI() { return xhtmlNamespaceURIAtom; }
       
   // Full tag names.
  -#define DEFINE_GETTER(name) \
  -    static const QualifiedName& name() { return name ## QName; }
  +#define DEFINE_TAG_GETTER(name) \
  +    static const QualifiedName& name() { return name ## Tag; }
  +
  +    DEFINE_TAG_GETTER(a)
  +    DEFINE_TAG_GETTER(abbr)
  +    DEFINE_TAG_GETTER(acronym)
  +    DEFINE_TAG_GETTER(address)
  +    DEFINE_TAG_GETTER(applet)
  +    DEFINE_TAG_GETTER(area)
  +    DEFINE_TAG_GETTER(b)
  +    DEFINE_TAG_GETTER(base)
  +    DEFINE_TAG_GETTER(basefont)
  +    DEFINE_TAG_GETTER(bdo)
  +    DEFINE_TAG_GETTER(big)
  +    DEFINE_TAG_GETTER(blockquote)
  +    DEFINE_TAG_GETTER(body)
  +    DEFINE_TAG_GETTER(br)
  +    DEFINE_TAG_GETTER(button)
  +    DEFINE_TAG_GETTER(canvas)
  +    DEFINE_TAG_GETTER(caption)
  +    DEFINE_TAG_GETTER(center)
  +    DEFINE_TAG_GETTER(cite)
  +    DEFINE_TAG_GETTER(code)
  +    DEFINE_TAG_GETTER(col)
  +    DEFINE_TAG_GETTER(colgroup)
  +    DEFINE_TAG_GETTER(dd)
  +    DEFINE_TAG_GETTER(del)
  +    DEFINE_TAG_GETTER(dfn)
  +    DEFINE_TAG_GETTER(dir)
  +    DEFINE_TAG_GETTER(div)
  +    DEFINE_TAG_GETTER(dl)
  +    DEFINE_TAG_GETTER(dt)
  +    DEFINE_TAG_GETTER(em)
  +    DEFINE_TAG_GETTER(embed)
  +    DEFINE_TAG_GETTER(fieldset)
  +    DEFINE_TAG_GETTER(font)
  +    DEFINE_TAG_GETTER(form)
  +    DEFINE_TAG_GETTER(frame)
  +    DEFINE_TAG_GETTER(frameset)
  +    DEFINE_TAG_GETTER(head)
  +    DEFINE_TAG_GETTER(h1)
  +    DEFINE_TAG_GETTER(h2)
  +    DEFINE_TAG_GETTER(h3)
  +    DEFINE_TAG_GETTER(h4)
  +    DEFINE_TAG_GETTER(h5)
  +    DEFINE_TAG_GETTER(h6)
  +    DEFINE_TAG_GETTER(hr)
  +    DEFINE_TAG_GETTER(html)
  +    DEFINE_TAG_GETTER(i)
  +    DEFINE_TAG_GETTER(iframe)
  +    DEFINE_TAG_GETTER(img)
  +    DEFINE_TAG_GETTER(input)
  +    DEFINE_TAG_GETTER(ins)
  +    DEFINE_TAG_GETTER(isindex)
  +    DEFINE_TAG_GETTER(kbd)
  +    DEFINE_TAG_GETTER(keygen)
  +    DEFINE_TAG_GETTER(label)
  +    DEFINE_TAG_GETTER(layer)
  +    DEFINE_TAG_GETTER(legend)
  +    DEFINE_TAG_GETTER(li)
  +    DEFINE_TAG_GETTER(link)
  +    DEFINE_TAG_GETTER(map)
  +    DEFINE_TAG_GETTER(marquee)
  +    DEFINE_TAG_GETTER(menu)
  +    DEFINE_TAG_GETTER(meta)
  +    DEFINE_TAG_GETTER(nobr)
  +    DEFINE_TAG_GETTER(noembed)
  +    DEFINE_TAG_GETTER(noframes)
  +    DEFINE_TAG_GETTER(nolayer)
  +    DEFINE_TAG_GETTER(noscript)
  +    DEFINE_TAG_GETTER(object)
  +    DEFINE_TAG_GETTER(ol)
  +    DEFINE_TAG_GETTER(optgroup)
  +    DEFINE_TAG_GETTER(option)
  +    DEFINE_TAG_GETTER(p)
  +    DEFINE_TAG_GETTER(param)
  +    DEFINE_TAG_GETTER(plaintext)
  +    DEFINE_TAG_GETTER(pre)
  +    DEFINE_TAG_GETTER(q)
  +    DEFINE_TAG_GETTER(s)
  +    DEFINE_TAG_GETTER(samp)
  +    DEFINE_TAG_GETTER(script)
  +    DEFINE_TAG_GETTER(select)
  +    DEFINE_TAG_GETTER(small)
  +    DEFINE_TAG_GETTER(span)
  +    DEFINE_TAG_GETTER(strike)
  +    DEFINE_TAG_GETTER(strong)
  +    DEFINE_TAG_GETTER(style)
  +    DEFINE_TAG_GETTER(sub)
  +    DEFINE_TAG_GETTER(sup)
  +    DEFINE_TAG_GETTER(table)
  +    DEFINE_TAG_GETTER(tbody)
  +    DEFINE_TAG_GETTER(td)
  +    DEFINE_TAG_GETTER(textarea)
  +    DEFINE_TAG_GETTER(tfoot)
  +    DEFINE_TAG_GETTER(th)
  +    DEFINE_TAG_GETTER(thead)
  +    DEFINE_TAG_GETTER(title)
  +    DEFINE_TAG_GETTER(tr)
  +    DEFINE_TAG_GETTER(tt)
  +    DEFINE_TAG_GETTER(u)
  +    DEFINE_TAG_GETTER(ul)
  +    DEFINE_TAG_GETTER(var)
  +    DEFINE_TAG_GETTER(wbr)
  +    DEFINE_TAG_GETTER(xmp)
  +#endif
  +
  +    // Init routine
  +    static void init();
  +};
   
  -    DEFINE_GETTER(a)
  -    DEFINE_GETTER(abbr)
  -    DEFINE_GETTER(acronym)
  -    DEFINE_GETTER(address)
  -    DEFINE_GETTER(applet)
  -    DEFINE_GETTER(area)
  -    DEFINE_GETTER(b)
  -    DEFINE_GETTER(base)
  -    DEFINE_GETTER(basefont)
  -    DEFINE_GETTER(bdo)
  -    DEFINE_GETTER(big)
  -    DEFINE_GETTER(blockquote)
  -    DEFINE_GETTER(body)
  -    DEFINE_GETTER(br)
  -    DEFINE_GETTER(button)
  -    DEFINE_GETTER(canvas)
  -    DEFINE_GETTER(caption)
  -    DEFINE_GETTER(center)
  -    DEFINE_GETTER(cite)
  -    DEFINE_GETTER(code)
  -    DEFINE_GETTER(col)
  -    DEFINE_GETTER(colgroup)
  -    DEFINE_GETTER(dd)
  -    DEFINE_GETTER(del)
  -    DEFINE_GETTER(dfn)
  -    DEFINE_GETTER(dir)
  -    DEFINE_GETTER(div)
  -    DEFINE_GETTER(dl)
  -    DEFINE_GETTER(dt)
  -    DEFINE_GETTER(em)
  -    DEFINE_GETTER(embed)
  -    DEFINE_GETTER(fieldset)
  -    DEFINE_GETTER(font)
  -    DEFINE_GETTER(form)
  -    DEFINE_GETTER(frame)
  -    DEFINE_GETTER(frameset)
  -    DEFINE_GETTER(head)
  -    DEFINE_GETTER(h1)
  -    DEFINE_GETTER(h2)
  -    DEFINE_GETTER(h3)
  -    DEFINE_GETTER(h4)
  -    DEFINE_GETTER(h5)
  -    DEFINE_GETTER(h6)
  -    DEFINE_GETTER(hr)
  -    DEFINE_GETTER(html)
  -    DEFINE_GETTER(i)
  -    DEFINE_GETTER(iframe)
  -    DEFINE_GETTER(img)
  -    DEFINE_GETTER(input)
  -    DEFINE_GETTER(ins)
  -    DEFINE_GETTER(isindex)
  -    DEFINE_GETTER(kbd)
  -    DEFINE_GETTER(keygen)
  -    DEFINE_GETTER(label)
  -    DEFINE_GETTER(layer)
  -    DEFINE_GETTER(legend)
  -    DEFINE_GETTER(li)
  -    DEFINE_GETTER(link)
  -    DEFINE_GETTER(map)
  -    DEFINE_GETTER(marquee)
  -    DEFINE_GETTER(menu)
  -    DEFINE_GETTER(meta)
  -    DEFINE_GETTER(nobr)
  -    DEFINE_GETTER(noembed)
  -    DEFINE_GETTER(noframes)
  -    DEFINE_GETTER(nolayer)
  -    DEFINE_GETTER(noscript)
  -    DEFINE_GETTER(object)
  -    DEFINE_GETTER(ol)
  -    DEFINE_GETTER(optgroup)
  -    DEFINE_GETTER(option)
  -    DEFINE_GETTER(p)
  -    DEFINE_GETTER(param)
  -    DEFINE_GETTER(plaintext)
  -    DEFINE_GETTER(pre)
  -    DEFINE_GETTER(q)
  -    DEFINE_GETTER(s)
  -    DEFINE_GETTER(samp)
  -    DEFINE_GETTER(script)
  -    DEFINE_GETTER(select)
  -    DEFINE_GETTER(small)
  -    DEFINE_GETTER(span)
  -    DEFINE_GETTER(strike)
  -    DEFINE_GETTER(strong)
  -    DEFINE_GETTER(style)
  -    DEFINE_GETTER(sub)
  -    DEFINE_GETTER(sup)
  -    DEFINE_GETTER(table)
  -    DEFINE_GETTER(tbody)
  -    DEFINE_GETTER(td)
  -    DEFINE_GETTER(textarea)
  -    DEFINE_GETTER(tfoot)
  -    DEFINE_GETTER(th)
  -    DEFINE_GETTER(thead)
  -    DEFINE_GETTER(title)
  -    DEFINE_GETTER(tr)
  -    DEFINE_GETTER(tt)
  -    DEFINE_GETTER(u)
  -    DEFINE_GETTER(ul)
  -    DEFINE_GETTER(var)
  -    DEFINE_GETTER(wbr)
  -    DEFINE_GETTER(xmp)
  +// FIXME: Make this a namespace instead of a class.
  +class HTMLAttributes
  +{
  +public:
  +#if !KHTML_HTMLNAMES_HIDE_GLOBALS
  +
  +// Full tag names.
  +#define DEFINE_ATTR_GETTER(name) \
  +    static const QualifiedName& name() { return name ## Attr; }
   
       // Attribute names.
  +    DEFINE_ATTR_GETTER(abbr)
  +    DEFINE_ATTR_GETTER(accept_charset)
  +    DEFINE_ATTR_GETTER(accept)
  +    DEFINE_ATTR_GETTER(accesskey)
  +    DEFINE_ATTR_GETTER(action)
  +    DEFINE_ATTR_GETTER(align)
  +    DEFINE_ATTR_GETTER(alink)
  +    DEFINE_ATTR_GETTER(alt)
  +    DEFINE_ATTR_GETTER(archive)
  +    DEFINE_ATTR_GETTER(autocomplete)
  +    DEFINE_ATTR_GETTER(autosave)
  +    DEFINE_ATTR_GETTER(axis)
  +    DEFINE_ATTR_GETTER(background)
  +    DEFINE_ATTR_GETTER(behavior)
  +    DEFINE_ATTR_GETTER(bgcolor)
  +    DEFINE_ATTR_GETTER(bgproperties)
  +    DEFINE_ATTR_GETTER(border)
  +    DEFINE_ATTR_GETTER(bordercolor)
  +    DEFINE_ATTR_GETTER(cellpadding)
  +    DEFINE_ATTR_GETTER(cellspacing)
  +    DEFINE_ATTR_GETTER(charAttr)
  +    DEFINE_ATTR_GETTER(challenge)
  +    DEFINE_ATTR_GETTER(charoff)
  +    DEFINE_ATTR_GETTER(charset)
  +    DEFINE_ATTR_GETTER(checked)
  +    DEFINE_ATTR_GETTER(cellborder)
  +    DEFINE_ATTR_GETTER(cite)
  +    DEFINE_ATTR_GETTER(classAttr)
  +    DEFINE_ATTR_GETTER(classid)
  +    DEFINE_ATTR_GETTER(clear)
  +    DEFINE_ATTR_GETTER(code)
  +    DEFINE_ATTR_GETTER(codebase)
  +    DEFINE_ATTR_GETTER(codetype)
  +    DEFINE_ATTR_GETTER(color)
  +    DEFINE_ATTR_GETTER(cols)
  +    DEFINE_ATTR_GETTER(colspan)
  +    DEFINE_ATTR_GETTER(compact)
  +    DEFINE_ATTR_GETTER(composite)
  +    DEFINE_ATTR_GETTER(content)
  +    DEFINE_ATTR_GETTER(contenteditable)
  +    DEFINE_ATTR_GETTER(coords)
  +    DEFINE_ATTR_GETTER(data)
  +    DEFINE_ATTR_GETTER(datetime)
  +    DEFINE_ATTR_GETTER(declare)
  +    DEFINE_ATTR_GETTER(defer)
  +    DEFINE_ATTR_GETTER(dir)
  +    DEFINE_ATTR_GETTER(direction)
  +    DEFINE_ATTR_GETTER(disabled)
  +    DEFINE_ATTR_GETTER(enctype)
  +    DEFINE_ATTR_GETTER(face)
  +    DEFINE_ATTR_GETTER(forAttr)
  +    DEFINE_ATTR_GETTER(frame)
  +    DEFINE_ATTR_GETTER(frameborder)
  +    DEFINE_ATTR_GETTER(headers)
  +    DEFINE_ATTR_GETTER(height)
  +    DEFINE_ATTR_GETTER(hidden)
  +    DEFINE_ATTR_GETTER(href)
  +    DEFINE_ATTR_GETTER(hreflang)
  +    DEFINE_ATTR_GETTER(hspace)
  +    DEFINE_ATTR_GETTER(http_equiv)
  +    DEFINE_ATTR_GETTER(idAttr)
  +    DEFINE_ATTR_GETTER(incremental)
  +    DEFINE_ATTR_GETTER(ismap)
  +    DEFINE_ATTR_GETTER(keytype)
  +    DEFINE_ATTR_GETTER(label)
  +    DEFINE_ATTR_GETTER(lang)
  +    DEFINE_ATTR_GETTER(language)
  +    DEFINE_ATTR_GETTER(left)
  +    DEFINE_ATTR_GETTER(leftmargin)
  +    DEFINE_ATTR_GETTER(link)
  +    DEFINE_ATTR_GETTER(longdesc)
  +    DEFINE_ATTR_GETTER(loop)
  +    DEFINE_ATTR_GETTER(marginheight)
  +    DEFINE_ATTR_GETTER(marginwidth)
  +    DEFINE_ATTR_GETTER(max)
  +    DEFINE_ATTR_GETTER(maxlength)
  +    DEFINE_ATTR_GETTER(mayscript)
  +    DEFINE_ATTR_GETTER(media)
  +    DEFINE_ATTR_GETTER(method)
  +    DEFINE_ATTR_GETTER(min)
  +    DEFINE_ATTR_GETTER(multiple)
  +    DEFINE_ATTR_GETTER(name)
  +    DEFINE_ATTR_GETTER(nohref)
  +    DEFINE_ATTR_GETTER(noresize)
  +    DEFINE_ATTR_GETTER(noshade)
  +    DEFINE_ATTR_GETTER(nowrap)
  +    DEFINE_ATTR_GETTER(object)
  +    DEFINE_ATTR_GETTER(onabort)
  +    DEFINE_ATTR_GETTER(onbeforecopy)
  +    DEFINE_ATTR_GETTER(onbeforecut)
  +    DEFINE_ATTR_GETTER(onbeforepaste)
  +    DEFINE_ATTR_GETTER(onblur)
  +    DEFINE_ATTR_GETTER(onchange)
  +    DEFINE_ATTR_GETTER(onclick)
  +    DEFINE_ATTR_GETTER(oncontextmenu)
  +    DEFINE_ATTR_GETTER(oncopy)
  +    DEFINE_ATTR_GETTER(oncut)
  +    DEFINE_ATTR_GETTER(ondblclick)
  +    DEFINE_ATTR_GETTER(ondrag)
  +    DEFINE_ATTR_GETTER(ondragend)
  +    DEFINE_ATTR_GETTER(ondragenter)
  +    DEFINE_ATTR_GETTER(ondragleave)
  +    DEFINE_ATTR_GETTER(ondragover)
  +    DEFINE_ATTR_GETTER(ondragstart)
  +    DEFINE_ATTR_GETTER(ondrop)
  +    DEFINE_ATTR_GETTER(onerror)
  +    DEFINE_ATTR_GETTER(onfocus)
  +    DEFINE_ATTR_GETTER(oninput)
  +    DEFINE_ATTR_GETTER(onkeydown)
  +    DEFINE_ATTR_GETTER(onkeypress)
  +    DEFINE_ATTR_GETTER(onkeyup)
  +    DEFINE_ATTR_GETTER(onload)
  +    DEFINE_ATTR_GETTER(onmousedown)
  +    DEFINE_ATTR_GETTER(onmousemove)
  +    DEFINE_ATTR_GETTER(onmouseout)
  +    DEFINE_ATTR_GETTER(onmouseover)
  +    DEFINE_ATTR_GETTER(onmouseup)
  +    DEFINE_ATTR_GETTER(onmousewheel)
  +    DEFINE_ATTR_GETTER(onpaste)
  +    DEFINE_ATTR_GETTER(onreset)
  +    DEFINE_ATTR_GETTER(onresize)
  +    DEFINE_ATTR_GETTER(onscroll)
  +    DEFINE_ATTR_GETTER(onsearch)
  +    DEFINE_ATTR_GETTER(onselect)
  +    DEFINE_ATTR_GETTER(onselectstart)
  +    DEFINE_ATTR_GETTER(onsubmit)
  +    DEFINE_ATTR_GETTER(onunload)
  +    DEFINE_ATTR_GETTER(pagex)
  +    DEFINE_ATTR_GETTER(pagey)
  +    DEFINE_ATTR_GETTER(placeholder)
  +    DEFINE_ATTR_GETTER(plain)
  +    DEFINE_ATTR_GETTER(pluginpage)
  +    DEFINE_ATTR_GETTER(pluginspage)
  +    DEFINE_ATTR_GETTER(pluginurl)
  +    DEFINE_ATTR_GETTER(precision)
  +    DEFINE_ATTR_GETTER(profile)
  +    DEFINE_ATTR_GETTER(prompt)
  +    DEFINE_ATTR_GETTER(readonly)
  +    DEFINE_ATTR_GETTER(rel)
  +    DEFINE_ATTR_GETTER(results)
  +    DEFINE_ATTR_GETTER(rev)
  +    DEFINE_ATTR_GETTER(rows)
  +    DEFINE_ATTR_GETTER(rowspan)
  +    DEFINE_ATTR_GETTER(rules)
  +    DEFINE_ATTR_GETTER(scheme)
  +    DEFINE_ATTR_GETTER(scope)
  +    DEFINE_ATTR_GETTER(scrollamount)
  +    DEFINE_ATTR_GETTER(scrolldelay)
  +    DEFINE_ATTR_GETTER(scrolling)
  +    DEFINE_ATTR_GETTER(selected)
  +    DEFINE_ATTR_GETTER(shape)
  +    DEFINE_ATTR_GETTER(size)
  +    DEFINE_ATTR_GETTER(span)
  +    DEFINE_ATTR_GETTER(src)
  +    DEFINE_ATTR_GETTER(standby)
  +    DEFINE_ATTR_GETTER(start)
  +    DEFINE_ATTR_GETTER(style)
  +    DEFINE_ATTR_GETTER(summary)
  +    DEFINE_ATTR_GETTER(tabindex)
  +    DEFINE_ATTR_GETTER(tableborder)
  +    DEFINE_ATTR_GETTER(target)
  +    DEFINE_ATTR_GETTER(text)
  +    DEFINE_ATTR_GETTER(title)
  +    DEFINE_ATTR_GETTER(top)
  +    DEFINE_ATTR_GETTER(topmargin)
  +    DEFINE_ATTR_GETTER(truespeed)
  +    DEFINE_ATTR_GETTER(type)
  +    DEFINE_ATTR_GETTER(usemap)
  +    DEFINE_ATTR_GETTER(valign)
  +    DEFINE_ATTR_GETTER(value)
  +    DEFINE_ATTR_GETTER(valuetype)
  +    DEFINE_ATTR_GETTER(version)
  +    DEFINE_ATTR_GETTER(vlink)
  +    DEFINE_ATTR_GETTER(vspace)
  +    DEFINE_ATTR_GETTER(width)
  +    DEFINE_ATTR_GETTER(wrap)
  +
   #endif
   
       // Init routine
  
  
  
  1.98      +6 -7      WebCore/khtml/html/htmlparser.cpp
  
  Index: htmlparser.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- htmlparser.cpp	9 Jul 2005 20:19:11 -0000	1.97
  +++ htmlparser.cpp	18 Jul 2005 21:44:21 -0000	1.98
  @@ -47,7 +47,6 @@
   #include "htmlfactory.h"
   #include "xml/dom_textimpl.h"
   #include "xml/dom_nodeimpl.h"
  -#include "misc/htmlhashes.h"
   #include "misc/main_thread_malloc.h"
   #include "misc/hashset.h"
   #include "html/htmltokenizer.h"
  @@ -350,7 +349,7 @@
                       bool changed = false;
                       for (unsigned long l = 0; map && l < map->length(); ++l) {
                           AttributeImpl* it = map->attributeItem(l);
  -                        changed = !bmap->getAttributeItem(it->id());
  +                        changed = !bmap->getAttributeItem(it->name());
                           bmap->insertAttribute(it->clone(false));
                       }
                       if (changed)
  @@ -387,7 +386,7 @@
                   bool changed = false;
                   for (unsigned long l = 0; map && l < map->length(); ++l) {
                       AttributeImpl* it = map->attributeItem(l);
  -                    changed = !bmap->getAttributeItem(it->id());
  +                    changed = !bmap->getAttributeItem(it->name());
                       bmap->insertAttribute(it->clone(false));
                   }
                   if (changed)
  @@ -397,7 +396,7 @@
               else if (!current->isDocumentNode())
                   return false;
           } else if (h->hasLocalName(HTMLNames::input())) {
  -            DOMString type = h->getAttribute(ATTR_TYPE);
  +            DOMString type = h->getAttribute(HTMLAttributes::type());
               if (strcasecmp(type, "hidden") == 0 && form) {
                   form->addChild(n);
                   if (!n->attached() && HTMLWidget)
  @@ -655,7 +654,7 @@
           // regressions and the headaches are not worth the work as long as there is
           // no site actually relying on that detail (Dirk)
           if (doc()->body())
  -            doc()->body()->setAttribute(ATTR_STYLE, "display:none");
  +            doc()->body()->setAttribute(HTMLAttributes::style(), "display:none");
           inBody = false;
       }
       if ((haveContent || haveFrameSet) && current->localName() == HTMLNames::html())
  @@ -1327,7 +1326,7 @@
           n = new HTMLDivElementImpl( document );
       NodeImpl *child = new HTMLHRElementImpl( document );
       n->addChild( child );
  -    AttributeImpl* a = t->attrs ? t->attrs->getAttributeItem(ATTR_PROMPT) : 0;
  +    AttributeImpl* a = t->attrs ? t->attrs->getAttributeItem(HTMLAttributes::prompt()) : 0;
   #if APPLE_CHANGES
       DOMString text = searchableIndexIntroduction();
   #else
  @@ -1338,7 +1337,7 @@
       child = new TextImpl(document, text);
       n->addChild( child );
       child = new HTMLIsIndexElementImpl(document, myform);
  -    static_cast<ElementImpl *>(child)->setAttribute(ATTR_TYPE, "khtml_isindex");
  +    static_cast<ElementImpl *>(child)->setAttribute(HTMLAttributes::type(), "khtml_isindex");
       n->addChild( child );
       child = new HTMLHRElementImpl( document );
       n->addChild( child );
  
  
  
  1.98      +36 -35    WebCore/khtml/html/htmltokenizer.cpp
  
  Index: htmltokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- htmltokenizer.cpp	10 Jul 2005 22:40:29 -0000	1.97
  +++ htmltokenizer.cpp	18 Jul 2005 21:44:21 -0000	1.98
  @@ -41,7 +41,6 @@
   #include "html/htmlparser.h"
   
   #include "misc/loader.h"
  -#include "misc/htmlhashes.h"
   
   #include "khtmlview.h"
   #include "khtml_part.h"
  @@ -65,7 +64,11 @@
   using DOM::commentAtom;
   using DOM::nullAtom;
   using DOM::textAtom;
  +using DOM::HTMLAttributes;
   using DOM::HTMLNames;
  +using DOM::QualifiedName;
  +using DOM::MappedAttributeImpl;
  +using DOM::NamedMappedAttrMapImpl;
   
   // turn off inlining to void warning with newer gcc
   #undef __inline
  @@ -231,6 +234,21 @@
       return true;
   }
   
  +void Token::addAttribute(DocumentImpl* doc, const AtomicString& attrName, const AtomicString& v)
  +{
  +    AttributeImpl* a = 0;
  +    if (!attrName.isEmpty() && attrName.string() != "/")
  +        a = new MappedAttributeImpl(QualifiedName(nullAtom, attrName, nullAtom), v);
  +
  +    if (a) {
  +        if(!attrs) {
  +            attrs = new NamedMappedAttrMapImpl(0);
  +            attrs->ref();
  +        }
  +        attrs->insertAttribute(a);
  +    }
  +}
  +
   // ----------------------------------------------------------------------------
   
   HTMLTokenizer::HTMLTokenizer(DOM::DocumentPtr *_doc, KHTMLView *_view, bool includesComments)
  @@ -245,7 +263,6 @@
       m_executingScript = 0;
       loadingExtScript = false;
       onHold = false;
  -    attrNamePresent = false;
       timerId = 0;
       includesCommentsInDOM = includesComments;
       loadStopped = false;
  @@ -1055,7 +1072,7 @@
                       beginTag = true;
   
                   // Ignore the / in fake xml tags like <br/>.  We trim off the "/" so that we'll get "br" as the tag name and not "br/".
  -                if(len > 1 && ptr[len-1] == '/' )
  +                if (len > 1 && ptr[len-1] == '/')
                       ptr[--len] = '\0';
   
                   // Now that we've shaved off any invalid / that might have followed the name), make the tag.
  @@ -1105,25 +1122,10 @@
                   curchar = *src;
                   if(curchar <= '>') {
                       if(curchar <= ' ' || curchar == '=' || curchar == '>') {
  -                        unsigned int a;
                           cBuffer[cBufferPos] = '\0';
  -                        a = getAttrID(cBuffer, cBufferPos);
  -                        if (a)
  -                            attrNamePresent = true;
  -                        else {
  -                            attrName = QString::fromLatin1(QCString(cBuffer, cBufferPos+1).data());
  -                            attrNamePresent = !attrName.isEmpty();
  -                        }
  -                        
  +                        attrName = AtomicString(cBuffer);
                           dest = buffer;
  -                        *dest++ = a;
  -#ifdef TOKEN_DEBUG
  -                        if (!a || (cBufferPos && *cBuffer == '!'))
  -                            kdDebug( 6036 ) << "Unknown attribute: *" << QCString(cBuffer, cBufferPos+1).data() << "*" << endl;
  -                        else
  -                            kdDebug( 6036 ) << "Known attribute: " << QCString(cBuffer, cBufferPos+1).data() << endl;
  -#endif
  -
  +                        *dest++ = 0;
                           tag = SearchEqual;
                           break;
                       }
  @@ -1138,8 +1140,7 @@
               }
               if ( cBufferPos == CBUFLEN ) {
                   cBuffer[cBufferPos] = '\0';
  -                attrName = QString::fromLatin1(QCString(cBuffer, cBufferPos+1).data());
  -                attrNamePresent = !attrName.isEmpty();
  +                attrName = AtomicString(cBuffer);
                   dest = buffer;
                   *dest++ = 0;
                   tag = SearchEqual;
  @@ -1165,7 +1166,7 @@
                           ++src;
                       }
                       else {
  -                        currToken.addAttribute(parser->docPtr()->document(), buffer, attrName, emptyAtom);
  +                        currToken.addAttribute(parser->docPtr()->document(), attrName, emptyAtom);
                           dest = buffer;
                           tag = SearchAttribute;
                       }
  @@ -1205,7 +1206,7 @@
                   checkBuffer();
   
                   curchar = src->unicode();
  -                if (curchar == '>' && !attrNamePresent) {
  +                if (curchar == '>' && attrName.isEmpty()) {
                       // Handle a case like <img '>.  Just go ahead and be willing
                       // to close the whole tag.  Don't consume the character and
                       // just go back into SearchEnd while ignoring the whole
  @@ -1216,8 +1217,8 @@
                       while(dest > buffer+1 && (*(dest-1) == '\n' || *(dest-1) == '\r'))
                           dest--; // remove trailing newlines
                       AtomicString v(buffer+1, dest-buffer-1);
  -                    attrName.setUnicode(buffer+1,dest-buffer-1); 
  -                    currToken.addAttribute(parser->docPtr()->document(), buffer, attrName, v);
  +                    attrName = v; // Just make the name/value match. (FIXME: Is this some WinIE quirk?)
  +                    currToken.addAttribute(parser->docPtr()->document(), attrName, v);
                       tag = SearchAttribute;
                       dest = buffer;
                       tquote = NoQuote;
  @@ -1239,9 +1240,9 @@
                           while(dest > buffer+1 && (*(dest-1) == '\n' || *(dest-1) == '\r'))
                               dest--; // remove trailing newlines
                           AtomicString v(buffer+1, dest-buffer-1);
  -                        if (!attrNamePresent)
  -                            attrName.setUnicode(buffer+1,dest-buffer-1); 
  -                        currToken.addAttribute(parser->docPtr()->document(), buffer, attrName, v);
  +                        if (attrName.isEmpty())
  +                            attrName = v; // Make the name match the value. (FIXME: Is this a WinIE quirk?)
  +                        currToken.addAttribute(parser->docPtr()->document(), attrName, v);
   
                           dest = buffer;
                           tag = SearchAttribute;
  @@ -1279,7 +1280,7 @@
                       if ( curchar <= ' ' || curchar == '>' )
                       {
                           AtomicString v(buffer+1, dest-buffer-1);
  -                        currToken.addAttribute(parser->docPtr()->document(), buffer, attrName, v);
  +                        currToken.addAttribute(parser->docPtr()->document(), attrName, v);
                           dest = buffer;
                           tag = SearchAttribute;
                           break;
  @@ -1334,17 +1335,17 @@
                        parser->doc()->part()->jScriptEnabled() && /* jscript allowed at all? */
                        view /* are we a regular tokenizer or just for innerHTML ? */
                       ) {
  -                    if ( ( a = currToken.attrs->getAttributeItem( ATTR_SRC ) ) )
  +                    if ((a = currToken.attrs->getAttributeItem(HTMLAttributes::src())))
                           scriptSrc = parser->doc()->completeURL(parseURL( a->value() ).string() );
  -                    if ( ( a = currToken.attrs->getAttributeItem( ATTR_CHARSET ) ) )
  +                    if ((a = currToken.attrs->getAttributeItem(HTMLAttributes::charset())))
                           scriptSrcCharset = a->value().string().stripWhiteSpace();
                       if ( scriptSrcCharset.isEmpty() )
                           scriptSrcCharset = parser->doc()->part()->encoding();
                       /* Check type before language, since language is deprecated */
  -                    if ((a = currToken.attrs->getAttributeItem(ATTR_TYPE)) != 0 && !a->value().string().isEmpty())
  +                    if ((a = currToken.attrs->getAttributeItem(HTMLAttributes::type())) != 0 && !a->value().string().isEmpty())
                           foundTypeAttribute = true;
                       else
  -                        a = currToken.attrs->getAttributeItem(ATTR_LANGUAGE);
  +                        a = currToken.attrs->getAttributeItem(HTMLAttributes::language());
                   }
                   javascript = true;
   
  @@ -1980,7 +1981,7 @@
           kdDebug( 6036 ) << "Attributes: " << l << endl;
           for (unsigned long i = 0; i < l; ++i) {
               AttributeImpl* c = currToken.attrs->attributeItem(i);
  -            kdDebug( 6036 ) << "    " << c->id() << " " << parser->doc()->getDocument()->attrName(c->id()).string()
  +            kdDebug( 6036 ) << "    " << c->name().string()
                               << "=\"" << c->value().string() << "\"" << endl;
           }
       }
  
  
  
  1.38      +3 -22     WebCore/khtml/html/htmltokenizer.h
  
  Index: htmltokenizer.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.h,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- htmltokenizer.h	9 Jul 2005 20:19:11 -0000	1.37
  +++ htmltokenizer.h	18 Jul 2005 21:44:21 -0000	1.38
  @@ -80,23 +80,7 @@
           if (text) text->deref();
       }
   
  -    void addAttribute(DOM::DocumentImpl* doc, QChar* buffer, const QString& attrName, const DOM::AtomicString& v)
  -    {
  -        DOM::AttributeImpl* a = 0;
  -        if (buffer->unicode())
  -            a = new DOM::MappedAttributeImpl(buffer->unicode(), v);
  -        else if (!attrName.isEmpty() && attrName != "/")
  -            a = new DOM::MappedAttributeImpl(doc->attrId(0, DOM::DOMString(attrName).implementation(), false),
  -                                             v);
  -
  -        if (a) {
  -            if(!attrs) {
  -                attrs = new DOM::NamedMappedAttrMapImpl(0);
  -                attrs->ref();
  -            }
  -            attrs->insertAttribute(a);
  -        }
  -    }
  +    void addAttribute(DOM::DocumentImpl* doc, const DOM::AtomicString& attrName, const DOM::AtomicString& v);
   
       bool isOpenTag(const DOM::QualifiedName& fullName) const { return beginTag && fullName.localName() == tagName; }
       bool isCloseTag(const DOM::QualifiedName& fullName) const { return !beginTag && fullName.localName() == tagName; }
  @@ -303,11 +287,8 @@
   
       bool brokenServer;
   
  -    // name of an unknown attribute
  -    QString attrName;
  -    // whether or not the attrname is present (either we found a known HTML attr or we found an unknown
  -    // nonempty attrName).
  -    bool attrNamePresent;
  +    // Name of an attribute that we just scanned.
  +    DOM::AtomicString attrName;
       
       // Used to store the code of a srcipting sequence
       QChar *scriptCode;
  
  
  
  1.37      +0 -2      WebCore/khtml/misc/decoder.cpp
  
  Index: decoder.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/decoder.cpp,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- decoder.cpp	9 Jul 2005 20:19:15 -0000	1.36
  +++ decoder.cpp	18 Jul 2005 21:44:25 -0000	1.37
  @@ -29,8 +29,6 @@
   #include "decoder.h"
   using namespace khtml;
   
  -#include "htmlhashes.h"
  -
   #include <qregexp.h>
   #include <qtextcodec.h>
   
  
  
  
  1.156     +0 -1      WebCore/khtml/rendering/render_box.cpp
  
  Index: render_box.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_box.cpp,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- render_box.cpp	9 Jul 2005 20:19:17 -0000	1.155
  +++ render_box.cpp	18 Jul 2005 21:44:26 -0000	1.156
  @@ -34,7 +34,6 @@
   #include "render_flexbox.h"
   #include "render_arena.h"
   
  -#include "misc/htmlhashes.h"
   #include "xml/dom_nodeimpl.h"
   #include "xml/dom_docimpl.h"
   #include "html/html_elementimpl.h"
  
  
  
  1.14      +0 -1      WebCore/khtml/rendering/render_canvasimage.cpp
  
  Index: render_canvasimage.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_canvasimage.cpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- render_canvasimage.cpp	9 Jul 2005 20:19:17 -0000	1.13
  +++ render_canvasimage.cpp	18 Jul 2005 21:44:26 -0000	1.14
  @@ -36,7 +36,6 @@
   
   #include "css/csshelper.h"
   #include "misc/helper.h"
  -#include "misc/htmlattrs.h"
   #include "html/html_formimpl.h"
   #include "html/html_canvasimpl.h"
   #include "xml/dom2_eventsimpl.h"
  
  
  
  1.110     +8 -9      WebCore/khtml/rendering/render_form.cpp
  
  Index: render_form.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- render_form.cpp	9 Jul 2005 20:19:17 -0000	1.109
  +++ render_form.cpp	18 Jul 2005 21:44:26 -0000	1.110
  @@ -34,7 +34,6 @@
   #include "misc/helper.h"
   #include "xml/dom2_eventsimpl.h"
   #include "html/html_formimpl.h"
  -#include "misc/htmlhashes.h"
   
   #include "rendering/render_form.h"
   #include <assert.h>
  @@ -694,10 +693,10 @@
       
   #if APPLE_CHANGES
       // Handle updating the search attributes.
  -    w->setPlaceholderString(e->getAttribute(ATTR_PLACEHOLDER).string());
  +    w->setPlaceholderString(e->getAttribute(HTMLAttributes::placeholder()).string());
       if (w->type() == QLineEdit::Search) {
  -        w->setLiveSearch(!e->getAttribute(ATTR_INCREMENTAL).isNull());
  -        w->setAutoSaveName(e->getAttribute(ATTR_AUTOSAVE).string());
  +        w->setLiveSearch(!e->getAttribute(HTMLAttributes::incremental()).isNull());
  +        w->setAutoSaveName(e->getAttribute(HTMLAttributes::autosave()).string());
           w->setMaxResults(e->maxResults());
       }
   #endif
  @@ -1192,7 +1191,7 @@
   
           for (listIndex = 0; listIndex < int(listItems.size()); listIndex++) {
               if (listItems[listIndex]->hasTagName(HTMLNames::optgroup())) {
  -                QString label = listItems[listIndex]->getAttribute(ATTR_LABEL).string();
  +                QString label = listItems[listIndex]->getAttribute(HTMLAttributes::label()).string();
                   label.replace(QChar('\\'), backslashAsCurrencySymbol());
   
                   // In WinIE, an optgroup can't start or end with whitespace (other than the indent
  @@ -1795,9 +1794,9 @@
   void RenderSlider::updateFromElement()
   {
       const DOMString& value = element()->value();
  -    const DOMString& min = element()->getAttribute(ATTR_MIN);
  -    const DOMString& max = element()->getAttribute(ATTR_MAX);
  -    const DOMString& precision = element()->getAttribute(ATTR_PRECISION);
  +    const DOMString& min = element()->getAttribute(HTMLAttributes::min());
  +    const DOMString& max = element()->getAttribute(HTMLAttributes::max());
  +    const DOMString& precision = element()->getAttribute(HTMLAttributes::precision());
       
       double minVal = min.isNull() ? 0.0 : min.string().toDouble();
       double maxVal = max.isNull() ? 100.0 : max.string().toDouble();
  @@ -1826,7 +1825,7 @@
       QSlider* slider = (QSlider*)widget();
   
       double val = slider->value();
  -    const DOMString& precision = element()->getAttribute(ATTR_PRECISION);
  +    const DOMString& precision = element()->getAttribute(HTMLAttributes::precision());
   
       // Force integer value if not float (strcasecmp returns confusingly backward boolean).
       if (strcasecmp(precision, "float"))
  
  
  
  1.71      +7 -8      WebCore/khtml/rendering/render_frames.cpp
  
  Index: render_frames.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_frames.cpp,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- render_frames.cpp	9 Jul 2005 20:19:17 -0000	1.70
  +++ render_frames.cpp	18 Jul 2005 21:44:26 -0000	1.71
  @@ -31,7 +31,6 @@
   #include "html/html_baseimpl.h"
   #include "html/html_objectimpl.h"
   #include "html/htmltokenizer.h"
  -#include "misc/htmlattrs.h"
   #include "xml/dom2_eventsimpl.h"
   #include "xml/dom_docimpl.h"
   #include "khtmlview.h"
  @@ -689,13 +688,13 @@
         HTMLElementImpl *embedOrObject;
         if (embed) {
             embedOrObject = (HTMLElementImpl *)embed;
  -          DOMString attribute = embedOrObject->getAttribute(ATTR_WIDTH);
  +          DOMString attribute = embedOrObject->getAttribute(HTMLAttributes::width());
             if (!attribute.isEmpty()) {
  -              o->setAttribute(ATTR_WIDTH, attribute);
  +              o->setAttribute(HTMLAttributes::width(), attribute);
             }
  -          attribute = embedOrObject->getAttribute(ATTR_HEIGHT);
  +          attribute = embedOrObject->getAttribute(HTMLAttributes::height());
             if (!attribute.isEmpty()) {
  -              o->setAttribute(ATTR_HEIGHT, attribute);
  +              o->setAttribute(HTMLAttributes::height(), attribute);
             }
             url = embed->url;
             serviceType = embed->serviceType;
  @@ -756,7 +755,7 @@
         if (attributes) {
             for (unsigned long i = 0; i < attributes->length(); ++i) {
                 AttributeImpl* it = attributes->attributeItem(i);
  -              QString name = o->getDocument()->attrName(it->id()).string();
  +              QString name = it->name().localName().string();
                 if (embed || uniqueParamNames.find(name) == 0) {
                     paramNames.append(name);
                     paramValues.append(it->value().string());
  @@ -803,7 +802,7 @@
               
   #if !APPLE_CHANGES      
         params.append( QString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( o->classId ) );
  -      params.append( QString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( o->getAttribute(ATTR_CODEBASE).string() ) );
  +      params.append( QString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( o->getAttribute(HTMLAttributes::codebase()).string() ) );
   #endif
   
         // Find out if we support fallback content.
  @@ -837,7 +836,7 @@
         if (a) {
             for (unsigned long i = 0; i < a->length(); ++i) {
                 AttributeImpl* it = a->attributeItem(i);
  -              paramNames.append(o->getDocument()->attrName(it->id()).string());
  +              paramNames.append(it->name().localName().string());
                 paramValues.append(it->value().string());
             }
         }
  
  
  
  1.80      +0 -1      WebCore/khtml/rendering/render_image.cpp
  
  Index: render_image.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_image.cpp,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- render_image.cpp	9 Jul 2005 20:19:17 -0000	1.79
  +++ render_image.cpp	18 Jul 2005 21:44:26 -0000	1.80
  @@ -36,7 +36,6 @@
   
   #include "css/csshelper.h"
   #include "misc/helper.h"
  -#include "misc/htmlattrs.h"
   #include "html/html_formimpl.h"
   #include "html/html_imageimpl.h"
   #include "xml/dom2_eventsimpl.h"
  
  
  
  1.199     +0 -1      WebCore/khtml/rendering/render_object.cpp
  
  Index: render_object.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_object.cpp,v
  retrieving revision 1.198
  retrieving revision 1.199
  diff -u -r1.198 -r1.199
  --- render_object.cpp	9 Jul 2005 20:19:18 -0000	1.198
  +++ render_object.cpp	18 Jul 2005 21:44:26 -0000	1.199
  @@ -34,7 +34,6 @@
   #include "xml/dom_docimpl.h"
   #include "xml/dom_position.h"
   #include "css/cssstyleselector.h"
  -#include "misc/htmlhashes.h"
   #include <kdebug.h>
   #include <qpainter.h>
   #include "khtmlview.h"
  
  
  
  1.128     +1 -2      WebCore/khtml/rendering/render_table.cpp
  
  Index: render_table.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_table.cpp,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- render_table.cpp	9 Jul 2005 20:19:18 -0000	1.127
  +++ render_table.cpp	18 Jul 2005 21:44:26 -0000	1.128
  @@ -31,7 +31,6 @@
   #include "rendering/render_table.h"
   #include "rendering/table_layout.h"
   #include "html/html_tableimpl.h"
  -#include "misc/htmlattrs.h"
   #include "htmlnames.h"
   #include "xml/dom_docimpl.h"
   
  @@ -1620,7 +1619,7 @@
       RenderBlock::calcMinMaxWidth();
       if (element() && style()->whiteSpace() == NORMAL) {
           // See if nowrap was set.
  -        DOMString nowrap = static_cast<ElementImpl*>(element())->getAttribute(ATTR_NOWRAP);
  +        DOMString nowrap = static_cast<ElementImpl*>(element())->getAttribute(HTMLAttributes::nowrap());
           if (!nowrap.isNull() && style()->width().isFixed())
               // Nowrap is set, but we didn't actually use it because of the
               // fixed width set on the cell.  Even so, it is a WinIE/Moz trait
  
  
  
  1.3       +0 -1      WebCore/khtml/xbl/xbl_tokenizer.cpp
  
  Index: xbl_tokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xbl/xbl_tokenizer.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xbl_tokenizer.cpp	30 Jan 2004 09:06:44 -0000	1.2
  +++ xbl_tokenizer.cpp	18 Jul 2005 21:44:28 -0000	1.3
  @@ -2,7 +2,6 @@
   
   #include "dom/dom_node.h"
   #include "xml/dom_elementimpl.h"
  -#include "misc/htmlattrs.h"
   
   #include "xbl_tokenizer.h"
   #include "xbl_docimpl.h"
  
  
  
  1.237     +18 -119   WebCore/khtml/xml/dom_docimpl.cpp
  
  Index: dom_docimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
  retrieving revision 1.236
  retrieving revision 1.237
  diff -u -r1.236 -r1.237
  --- dom_docimpl.cpp	16 Jul 2005 06:45:18 -0000	1.236
  +++ dom_docimpl.cpp	18 Jul 2005 21:44:28 -0000	1.237
  @@ -38,7 +38,6 @@
   #include "css/cssstyleselector.h"
   #include "css/css_stylesheetimpl.h"
   #include "css/css_valueimpl.h"
  -#include "misc/htmlhashes.h"
   #include "misc/helper.h"
   #include "ecma/kjs_proxy.h"
   #include "ecma/kjs_binding.h"
  @@ -498,7 +497,7 @@
   
   ElementImpl *DocumentImpl::createElement(const DOMString &name, int &exceptionCode)
   {
  -    return createElementNS(emptyAtom, name, exceptionCode);
  +    return createElementNS(nullAtom, name, exceptionCode);
   }
   
   DocumentFragmentImpl *DocumentImpl::createDocumentFragment(  )
  @@ -526,13 +525,6 @@
       return new ProcessingInstructionImpl( docPtr(),target,data);
   }
   
  -AttrImpl *DocumentImpl::createAttribute( NodeImpl::Id id )
  -{
  -    // Assume this is an HTML attribute, since createAttribute isn't namespace-aware.  There's no harm to XML
  -    // documents if we're wrong.
  -    return new AttrImpl(0, docPtr(), new MappedAttributeImpl(id, DOMString("").implementation()));
  -}
  -
   EntityReferenceImpl *DocumentImpl::createEntityReference ( const DOMString &name )
   {
       return new EntityReferenceImpl(docPtr(), name.implementation());
  @@ -576,20 +568,8 @@
               if (attrs) {
                   unsigned length = attrs->length();
                   for (unsigned i = 0; i < length; i++) {
  -                    AttrImpl *attr = attrs->item(i);
  -                    DOMString qualifiedName = attr->nodeName();
  -                    DOMString value = attr->nodeValue();
  -
  -                    int colonpos = qualifiedName.find(':');
  -                    DOMString localName = qualifiedName;
  -                    if (colonpos >= 0) {
  -                        localName.remove(0, colonpos + 1);
  -                        // ### extract and set new prefix
  -                    }
  -
  -                    // FIXME: Lose the namespace here for now.  This code will change soon anyway.
  -                    NodeImpl::Id nodeId = attrId(0, localName.implementation(), false /* allocate */);
  -                    newElement->setAttribute(nodeId, value.implementation(), exceptioncode);
  +                    AttributeImpl* attr = attrs->attributeItem(i);
  +                    newElement->setAttribute(attr->name(), attr->value().implementation(), exceptioncode);
                       if (exceptioncode != 0) {
                           newElement->deref();
                           return 0;
  @@ -625,7 +605,7 @@
       return 0;
   }
   
  -ElementImpl *DocumentImpl::createElementNS( const DOMString &_namespaceURI, const DOMString &_qualifiedName, int &exceptioncode)
  +ElementImpl *DocumentImpl::createElementNS(const DOMString &_namespaceURI, const DOMString &_qualifiedName, int &exceptioncode)
   {
       // Split the name.
       int exceptionCode = 0;
  @@ -681,7 +661,7 @@
               
               element = static_cast<ElementImpl *>(n);
               
  -            if (element->hasID() && element->getAttribute(ATTR_ID) == elementId) {
  +            if (element->hasID() && element->getAttribute(HTMLAttributes::idAttr()) == elementId) {
                   if (idCount == 1) 
                       m_idCount.remove(qId);
                   else
  @@ -754,7 +734,7 @@
               if (!n->isElementNode())
                   continue;
               const ElementImpl *elementImpl = static_cast<const ElementImpl *>(n);
  -            DOMString accessKey(elementImpl->getAttribute(ATTR_ACCESSKEY));
  +            DOMString accessKey(elementImpl->getAttribute(HTMLAttributes::accesskey()));;
               if (!accessKey.isEmpty()) {
                   QString ak = accessKey.string().lower();
                   if (m_elementsByAccessKey.find(ak) == NULL)
  @@ -1847,8 +1827,8 @@
           if (renderInfo.URLElement()) {
               assert(renderInfo.URLElement()->isElementNode());
               ElementImpl* e =  static_cast<ElementImpl*>(renderInfo.URLElement());
  -            DOMString href = khtml::parseURL(e->getAttribute(ATTR_HREF));
  -            DOMString target = e->getAttribute(ATTR_TARGET);
  +            DOMString href = khtml::parseURL(e->getAttribute(HTMLAttributes::href()));
  +            DOMString target = e->getAttribute(HTMLAttributes::target());
   
               if (!target.isNull() && !href.isNull()) {
                   ev->target = target;
  @@ -1913,87 +1893,6 @@
       return 0;
   }
   
  -NodeImpl::Id DocumentImpl::attrId(DOMStringImpl* _namespaceURI, DOMStringImpl *_name, bool readonly)
  -{
  -    // Each document maintains a mapping of attrname -> id for every attr name
  -    // encountered in the document.
  -    // For attrnames without a prefix (no qualified element name) and without matching
  -    // namespace, the value defined in misc/htmlattrs.h is used.
  -    NodeImpl::Id id = 0;
  -
  -    // First see if it's a HTML attribute name
  -    QConstString n(_name->s, _name->l);
  -    if (!_namespaceURI) {
  -        // we're in HTML namespace if we know the tag.
  -        // xhtml is lower case - case sensitive, easy to implement
  -        if ( htmlMode() == XHtml && (id = getAttrID(n.string().ascii(), _name->l)) )
  -            return id;
  -        // compatibility: upper case - case insensitive
  -        if ( htmlMode() != XHtml && (id = getAttrID(n.string().lower().ascii(), _name->l )) )
  -            return id;
  -
  -        // ok, the fast path didn't work out, we need the full check
  -    }
  -
  -    // now lets find out the namespace
  -    Q_UINT16 ns = noNamespace;
  -    /* FIXME: Just break namespaced attributes for now.  Will fix in next stage of QualifiedName conversion.
  -    if (_namespaceURI) {
  -        DOMString nsU(_namespaceURI);
  -        int nsID = XmlNamespaceTable::getNamespaceID(nsU, readonly);
  -        if (nsID != -1)
  -            ns = (Q_UINT16)nsID;
  -    }*/
  -    
  -    // Look in the m_attrNames array for the name
  -    // ### yeah, this is lame. use a dictionary / map instead
  -    DOMString nme(n.string());
  -    // compatibility mode has to store upper case
  -    if (htmlMode() != XHtml) nme = nme.upper();
  -    for (id = 0; id < m_attrNameCount; id++)
  -        if (DOMString(m_attrNames[id]) == nme)
  -            return makeId(ns, ATTR_LAST_ATTR+id);
  -
  -    // unknown
  -    if (readonly) return 0;
  -
  -    // Name not found in m_attrNames, so let's add it
  -    // ### yeah, this is lame. use a dictionary / map instead
  -    if (m_attrNameCount+1 > m_attrNameAlloc) {
  -        m_attrNameAlloc += 100;
  -        DOMStringImpl **newNames = new DOMStringImpl* [m_attrNameAlloc];
  -        if (m_attrNames) {
  -            unsigned short i;
  -            for (i = 0; i < m_attrNameCount; i++)
  -                newNames[i] = m_attrNames[i];
  -            delete [] m_attrNames;
  -        }
  -        m_attrNames = newNames;
  -    }
  -
  -    id = m_attrNameCount++;
  -    m_attrNames[id] = nme.implementation();
  -    m_attrNames[id]->ref();
  -
  -    return makeId(ns, ATTR_LAST_ATTR+id);
  -}
  -
  -DOMString DocumentImpl::attrName(NodeImpl::Id _id) const
  -{
  -    DOMString result;
  -    if (localNamePart(_id) >= ATTR_LAST_ATTR)
  -        result = m_attrNames[localNamePart(_id)-ATTR_LAST_ATTR];
  -    else
  -        result = getAttrName(_id);
  -
  -    // Attribute names are always lowercase in the DOM for both
  -    // HTML and XHTML.
  -    if (isHTMLDocument() || htmlMode() == XHtml)
  -        return result.lower();
  -
  -    return result;
  -}
  -
   StyleSheetListImpl* DocumentImpl::styleSheets()
   {
       return m_styleSheets;
  @@ -2119,7 +2018,7 @@
           }
           else if (n->isHTMLElement() && (n->hasTagName(HTMLNames::link()) || n->hasTagName(HTMLNames::style()))) {
               HTMLElementImpl *e = static_cast<HTMLElementImpl *>(n);
  -            QString title = e->getAttribute( ATTR_TITLE ).string();
  +            QString title = e->getAttribute(HTMLAttributes::title()).string();
               bool enabledViaScript = false;
               if (e->hasLocalName(HTMLNames::link())) {
                   // <LINK> element
  @@ -2149,7 +2048,7 @@
                       // we are NOT an alternate sheet, then establish
                       // us as the preferred set.  Otherwise, just ignore
                       // this sheet.
  -                    QString rel = e->getAttribute( ATTR_REL ).string();
  +                    QString rel = e->getAttribute(HTMLAttributes::rel()).string();
                       if (e->hasLocalName(HTMLNames::style()) || !rel.contains("alternate"))
                           m_preferredStylesheetSet = view()->part()->d->m_sheetUsed = title;
                   }
  @@ -3089,11 +2988,12 @@
           return 0;
       }
   
  -    DOMString localName(qualifiedName.copy());
  +    DOMString localName = qualifiedName;
       DOMString prefix;
       int colonpos;
       if ((colonpos = qualifiedName.find(':')) >= 0) {
           prefix = qualifiedName.copy();
  +        localName = qualifiedName.copy();
           prefix.truncate(colonpos);
           localName.remove(0, colonpos+1);
       }
  @@ -3102,13 +3002,12 @@
           exception = DOMException::INVALID_CHARACTER_ERR;
           return 0;
       }
  -    // ### check correctness of namespace, prefix?
  -
  -    Id id = attrId(namespaceURI.implementation(), localName.implementation(), false /* allocate */);
  -    AttrImpl *attr = createAttribute(id);
  -    if (!prefix.isNull())
  -        attr->setPrefix(prefix.implementation(), exception);
  -    return attr;
  +    
  +    // FIXME: Assume this is a mapped attribute, since createAttribute isn't namespace-aware.  There's no harm to XML
  +    // documents if we're wrong.
  +    return new AttrImpl(0, docPtr(), new MappedAttributeImpl(QualifiedName(prefix.implementation(), 
  +                                                                           localName.implementation(),
  +                                                                           namespaceURI.implementation()), DOMString("").implementation()));
   }
   
   SharedPtr<HTMLCollectionImpl> DocumentImpl::images()
  
  
  
  1.118     +0 -7      WebCore/khtml/xml/dom_docimpl.h
  
  Index: dom_docimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.h,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- dom_docimpl.h	14 Jul 2005 17:58:17 -0000	1.117
  +++ dom_docimpl.h	18 Jul 2005 21:44:28 -0000	1.118
  @@ -183,7 +183,6 @@
       CommentImpl *createComment ( const DOMString &data );
       CDATASectionImpl *createCDATASection ( const DOMString &data );
       ProcessingInstructionImpl *createProcessingInstruction ( const DOMString &target, const DOMString &data );
  -    AttrImpl *createAttribute(Id id);
       AttrImpl *createAttribute(const DOMString &name, int &exception) { return createAttributeNS(DOMString(), name, exception); }
       AttrImpl *createAttributeNS(const DOMString &namespaceURI, const DOMString &qualifiedName, int &exception);
       EntityReferenceImpl *createEntityReference ( const DOMString &name );
  @@ -390,12 +389,6 @@
       virtual bool childTypeAllowed( unsigned short nodeType );
       virtual NodeImpl *cloneNode ( bool deep );
   
  -    // ### think about implementing ref'counting for the id's
  -    // in order to be able to reassign those that are no longer in use
  -    // (could make problems when it is still kept somewhere around, i.e. styleselector)
  -    NodeImpl::Id attrId(DOMStringImpl* _namespaceURI, DOMStringImpl *_name, bool readonly);
  -    DOMString attrName(NodeImpl::Id _id) const;
  -
       StyleSheetListImpl* styleSheets();
   
       /* Newly proposed CSS3 mechanism for selecting alternate
  
  
  
  1.69      +115 -138  WebCore/khtml/xml/dom_elementimpl.cpp
  
  Index: dom_elementimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_elementimpl.cpp,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- dom_elementimpl.cpp	9 Jul 2005 20:19:21 -0000	1.68
  +++ dom_elementimpl.cpp	18 Jul 2005 21:44:28 -0000	1.69
  @@ -36,7 +36,6 @@
   #include "html/htmlparser.h"
   
   #include "rendering/render_canvas.h"
  -#include "misc/htmlhashes.h"
   #include "css/css_valueimpl.h"
   #include "css/cssproperties.h"
   #include "css/cssvalues.h"
  @@ -52,13 +51,11 @@
   
   AttributeImpl* AttributeImpl::clone(bool) const
   {
  -    AttributeImpl* result = new AttributeImpl(m_id, _value);
  -    result->setPrefix(_prefix);
  -    return result;
  +    return new AttributeImpl(m_name, m_value);
   }
   
   void AttributeImpl::allocateImpl(ElementImpl* e) {
  -    _impl = new AttrImpl(e, e->docPtr(), this);
  +    m_impl = new AttrImpl(e, e->docPtr(), this);
   }
   
   AttrImpl::AttrImpl(ElementImpl* element, DocumentPtr* docPtr, AttributeImpl* a)
  @@ -66,21 +63,23 @@
         m_element(element),
         m_attribute(a)
   {
  -    assert(!m_attribute->_impl);
  -    m_attribute->_impl = this;
  +    assert(!m_attribute->m_impl);
  +    m_attribute->m_impl = this;
       m_attribute->ref();
       m_specified = true;
   }
   
   AttrImpl::~AttrImpl()
   {
  -    assert(m_attribute->_impl == this);
  -    m_attribute->_impl = 0;
  +    assert(m_attribute->m_impl == this);
  +    m_attribute->m_impl = 0;
       m_attribute->deref();
   }
   
   DOMString AttrImpl::nodeName() const
   {
  +    if (m_element && m_element->getDocument()->isHTMLDocument())
  +        return name().upper(); // Have to uppercase attributes when returned in HTML (and not XML).
       return name();
   }
   
  @@ -191,7 +190,7 @@
   
   DOMString AttrImpl::name() const
   {
  -    return getDocument()->attrName(m_attribute->id());
  +    return m_attribute->name().toString();
   }
   
   DOMString AttrImpl::value() const
  @@ -231,20 +230,20 @@
       return clone;
   }
   
  -void ElementImpl::removeAttribute( NodeImpl::Id id, int &exceptioncode )
  +void ElementImpl::removeAttribute(const QualifiedName& name, int &exceptioncode)
   {
       if (namedAttrMap) {
  -        namedAttrMap->removeNamedItem(id, exceptioncode);
  +        namedAttrMap->removeNamedItem(name, exceptioncode);
           if (exceptioncode == DOMException::NOT_FOUND_ERR) {
               exceptioncode = 0;
           }
       }
   }
   
  -void ElementImpl::setAttribute(NodeImpl::Id id, const DOMString &value)
  +void ElementImpl::setAttribute(const QualifiedName& name, const DOMString &value)
   {
       int exceptioncode = 0;
  -    setAttribute(id,value.implementation(),exceptioncode);
  +    setAttribute(name, value.implementation(), exceptioncode);
   }
   
   // Virtual function, defined in base class.
  @@ -276,13 +275,13 @@
       return namedAttrMap ? namedAttrMap->id() : nullAtom;
   }
   
  -const AtomicString& ElementImpl::getAttribute(NodeImpl::Id id) const
  +const AtomicString& ElementImpl::getAttribute(const QualifiedName& name) const
   {
  -    if (id == ATTR_STYLE)
  +    if (name == HTMLAttributes::style())
           updateStyleAttributeIfNeeded();
   
       if (namedAttrMap) {
  -        AttributeImpl* a = namedAttrMap->getAttributeItem(id);
  +        AttributeImpl* a = namedAttrMap->getAttributeItem(name);
           if (a) return a->value();
       }
       return nullAtom;
  @@ -290,20 +289,21 @@
   
   const AtomicString& ElementImpl::getAttributeNS(const DOMString &namespaceURI,
                                                   const DOMString &localName) const
  -{   
  -    NodeImpl::Id id = getDocument()->attrId(namespaceURI.implementation(),
  -                                            localName.implementation(), true);
  -    if (!id) return nullAtom;
  -    return getAttribute(id);
  +{
  +    DOMString ln(localName);
  +    if (getDocument()->isHTMLDocument())
  +        ln = localName.lower();
  +    QualifiedName name(nullAtom, ln.implementation(), namespaceURI.implementation());
  +    return getAttribute(name);
   }
   
  -void ElementImpl::setAttribute(NodeImpl::Id id, DOMStringImpl* value, int &exceptioncode )
  +void ElementImpl::setAttribute(const QualifiedName& name, DOMStringImpl* value, int &exceptioncode )
   {
       if (inDocument())
           getDocument()->incDOMTreeVersion();
   
       // allocate attributemap if necessary
  -    AttributeImpl* old = attributes(false)->getAttributeItem(id);
  +    AttributeImpl* old = attributes(false)->getAttributeItem(name);
   
       // NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly
       if (namedAttrMap->isReadOnly()) {
  @@ -311,23 +311,22 @@
           return;
       }
   
  -    if (id == ATTR_ID) {
  +    if (name == HTMLAttributes::idAttr())
   	updateId(old ? old->value() : nullAtom, value);
  -    }
       
       if (old && !value)
  -        namedAttrMap->removeAttribute(id);
  +        namedAttrMap->removeAttribute(name);
       else if (!old && value)
  -        namedAttrMap->addAttribute(createAttribute(id, value));
  +        namedAttrMap->addAttribute(createAttribute(name, value));
       else if (old && value) {
           old->setValue(value);
           attributeChanged(old);
       }
   }
   
  -AttributeImpl* ElementImpl::createAttribute(NodeImpl::Id id, DOMStringImpl* value)
  +AttributeImpl* ElementImpl::createAttribute(const QualifiedName& name, DOMStringImpl* value)
   {
  -    return new AttributeImpl(id, value);
  +    return new AttributeImpl(name, value);
   }
   
   void ElementImpl::setAttributeMap( NamedAttrMapImpl* list )
  @@ -338,8 +337,8 @@
       // If setting the whole map changes the id attribute, we need to
       // call updateId.
   
  -    AttributeImpl *oldId = namedAttrMap ? namedAttrMap->getAttributeItem(ATTR_ID) : 0;
  -    AttributeImpl *newId = list ? list->getAttributeItem(ATTR_ID) : 0;
  +    AttributeImpl *oldId = namedAttrMap ? namedAttrMap->getAttributeItem(HTMLAttributes::idAttr()) : 0;
  +    AttributeImpl *newId = list ? list->getAttributeItem(HTMLAttributes::idAttr()) : 0;
   
       if (oldId || newId) {
   	updateId(oldId ? oldId->value() : nullAtom, newId ? newId->value() : nullAtom);
  @@ -367,10 +366,7 @@
   
   DOMString ElementImpl::nodeName() const
   {
  -    DOMString tn = m_tagName.localName();
  -    if (m_tagName.hasPrefix())
  -        return DOMString(m_tagName.prefix()) + ":" + tn;
  -    return tn;
  +    return m_tagName.toString();
   }
   
   void ElementImpl::setPrefix(const AtomicString &_prefix, int &exceptioncode)
  @@ -419,7 +415,7 @@
       if (hasID()) {
           NamedAttrMapImpl *attrs = attributes(true);
           if (attrs) {
  -            AttributeImpl *idAttr = attrs->getAttributeItem(ATTR_ID);
  +            AttributeImpl *idAttr = attrs->getAttributeItem(HTMLAttributes::idAttr());
               if (idAttr && !idAttr->isNull()) {
                   updateId(nullAtom, idAttr->value());
               }
  @@ -432,7 +428,7 @@
       if (hasID()) {
           NamedAttrMapImpl *attrs = attributes(true);
           if (attrs) {
  -            AttributeImpl *idAttr = attrs->getAttributeItem(ATTR_ID);
  +            AttributeImpl *idAttr = attrs->getAttributeItem(HTMLAttributes::idAttr());
               if (idAttr && !idAttr->isNull()) {
                   updateId(idAttr->value(), nullAtom);
               }
  @@ -566,19 +562,13 @@
   	    result += " ";
   
   	    AttributeImpl *attribute = attrMap->attributeItem(i);
  -	    AttrImpl *attr = attribute->attrImpl();
  -
  -	    if (attr) {
  -		result += attr->toString();
  -	    } else {
  -		result += getDocument()->attrName(attribute->id());
  -		if (!attribute->value().isNull()) {
  -		    result += "=\"";
  -		    // FIXME: substitute entities for any instances of " or '
  -		    result += attribute->value();
  -		    result += "\"";
  -		}
  -	    }
  +	    result += attribute->name().toString();
  +            if (!attribute->value().isNull()) {
  +                result += "=\"";
  +                // FIXME: substitute entities for any instances of " or '
  +                result += attribute->value();
  +                result += "\"";
  +            }
   	}
       }
   
  @@ -628,8 +618,8 @@
       if (namedAttrMap) {
           for (uint i = 0; i < namedAttrMap->length(); i++) {
               AttributeImpl *attr = namedAttrMap->attributeItem(i);
  -            *stream << " " << DOMString(getDocument()->attrName(attr->id())).string().ascii()
  -                    << "=\"" << DOMString(attr->value()).string().ascii() << "\"";
  +            *stream << " " << attr->name().localName().string().ascii()
  +                    << "=\"" << attr->value().string().ascii() << "\"";
           }
       }
   
  @@ -648,7 +638,7 @@
           result += s;
       }
             
  -    s = getAttribute(ATTR_ID);
  +    s = getAttribute(HTMLAttributes::idAttr());
       if (s.length() > 0) {
           if (result.length() > 0)
               result += "; ";
  @@ -656,7 +646,7 @@
           result += s;
       }
             
  -    s = getAttribute(ATTR_CLASS);
  +    s = getAttribute(HTMLAttributes::classAttr());
       if (s.length() > 0) {
           if (result.length() > 0)
               result += "; ";
  @@ -688,16 +678,19 @@
       if (!attrs)
           return SharedPtr<AttrImpl>();
   
  -    return static_pointer_cast<AttrImpl>(attrs->removeNamedItem(attr->m_attribute->id(), exception));
  +    return static_pointer_cast<AttrImpl>(attrs->removeNamedItem(attr->m_attribute->name(), exception));
   }
   
   void ElementImpl::setAttributeNS(const DOMString &namespaceURI, const DOMString &qualifiedName, const DOMString &value, int &exception)
   {
  -    int colonpos = qualifiedName.find(':');
       DOMString localName = qualifiedName;
  -    if (colonpos >= 0) {
  +    DOMString prefix;
  +    int colonpos;
  +    if ((colonpos = qualifiedName.find(':')) >= 0) {
  +        prefix = qualifiedName.copy();
  +        localName = qualifiedName.copy();
  +        prefix.truncate(colonpos);
           localName.remove(0, colonpos+1);
  -        // ### extract and set new prefix
       }
   
       if (!DocumentImpl::isValidName(localName)) {
  @@ -705,38 +698,42 @@
           return;
       }
   
  -    Id id = getDocument()->attrId(namespaceURI.implementation(), localName.implementation(), false /* allocate */);
  -    setAttribute(id, value.implementation(), exception);
  +    if (getDocument()->isHTMLDocument())
  +        localName = localName.lower();
  +        
  +    setAttribute(QualifiedName(prefix.implementation(), localName.implementation(),
  +                               namespaceURI.implementation()), value.implementation(), exception);
   }
   
   void ElementImpl::removeAttributeNS(const DOMString &namespaceURI, const DOMString &localName, int &exception)
   {
  -    Id id = getDocument()->attrId(namespaceURI.implementation(), localName.implementation(), true);
  -    if (!id)
  -        return;
  -    removeAttribute(id, exception);
  +    DOMString ln(localName);
  +    if (getDocument() && getDocument()->isHTMLDocument())
  +        ln = localName.lower();
  +    removeAttribute(QualifiedName(nullAtom, ln.implementation(), namespaceURI.implementation()), exception);
   }
   
   AttrImpl *ElementImpl::getAttributeNodeNS(const DOMString &namespaceURI, const DOMString &localName)
   {
  -    Id id = getDocument()->attrId(namespaceURI.implementation(), localName.implementation(), true);
  -    if (!id)
  -        return 0;
       NamedAttrMapImpl *attrs = attributes(true);
       if (!attrs)
           return 0;
  -    return attrs->getNamedItem(id);
  +    DOMString ln(localName);
  +    if (getDocument() && getDocument()->isHTMLDocument())
  +        ln = localName.lower();
  +    return attrs->getNamedItem(QualifiedName(nullAtom, localName.implementation(), namespaceURI.implementation()));
   }
   
   bool ElementImpl::hasAttributeNS(const DOMString &namespaceURI, const DOMString &localName) const
   {
  -    Id id = getDocument()->attrId(namespaceURI.implementation(), localName.implementation(), true);
  -    if (!id)
  -        return false;
       NamedAttrMapImpl *attrs = attributes(true);
       if (!attrs)
           return false;
  -    return attrs->getAttributeItem(id);
  +    DOMString ln(localName);
  +    if (getDocument() && getDocument()->isHTMLDocument())
  +        ln = localName.lower();
  +    return attrs->getAttributeItem(QualifiedName(nullAtom, localName.implementation(), 
  +                                                 namespaceURI.implementation()));
   }
   
   CSSStyleDeclarationImpl *ElementImpl::style()
  @@ -800,9 +797,9 @@
       return false;
   }
   
  -AttrImpl *NamedAttrMapImpl::getNamedItem ( NodeImpl::Id id ) const
  +AttrImpl *NamedAttrMapImpl::getNamedItem(const QualifiedName& name) const
   {
  -    AttributeImpl* a = getAttributeItem(id);
  +    AttributeImpl* a = getAttributeItem(name);
       if (!a) return 0;
   
       if (!a->attrImpl())
  @@ -838,7 +835,7 @@
       AttrImpl *attr = static_cast<AttrImpl*>(arg);
   
       AttributeImpl* a = attr->attrImpl();
  -    AttributeImpl* old = getAttributeItem(a->id());
  +    AttributeImpl* old = getAttributeItem(a->name());
       if (old == a)
           return SharedPtr<NodeImpl>(arg); // we know about it already
   
  @@ -849,17 +846,16 @@
           return SharedPtr<NodeImpl>();
       }
   
  -    if (a->id() == ATTR_ID) {
  +    if (a->name() == HTMLAttributes::idAttr())
   	element->updateId(old ? old->value() : nullAtom, a->value());
  -    }
   
       // ### slightly inefficient - resizes attribute array twice.
       SharedPtr<NodeImpl> r;
       if (old) {
           if (!old->attrImpl())
               old->allocateImpl(element);
  -        r.reset(old->_impl);
  -        removeAttribute(a->id());
  +        r.reset(old->m_impl);
  +        removeAttribute(a->name());
       }
   
       addAttribute(a);
  @@ -869,7 +865,7 @@
   // The DOM2 spec doesn't say that removeAttribute[NS] throws NOT_FOUND_ERR
   // if the attribute is not found, but at this level we have to throw NOT_FOUND_ERR
   // because of removeNamedItem, removeNamedItemNS, and removeAttributeNode.
  -SharedPtr<NodeImpl> NamedAttrMapImpl::removeNamedItem ( NodeImpl::Id id, int &exceptioncode )
  +SharedPtr<NodeImpl> NamedAttrMapImpl::removeNamedItem(const QualifiedName& name, int &exceptioncode)
   {
       // ### should this really be raised when the attribute to remove isn't there at all?
       // NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly
  @@ -878,7 +874,7 @@
           return SharedPtr<NodeImpl>();
       }
   
  -    AttributeImpl* a = getAttributeItem(id);
  +    AttributeImpl* a = getAttributeItem(name);
       if (!a) {
           exceptioncode = DOMException::NOT_FOUND_ERR;
           return SharedPtr<NodeImpl>();
  @@ -887,11 +883,10 @@
       if (!a->attrImpl())  a->allocateImpl(element);
       SharedPtr<NodeImpl> r(a->attrImpl());
   
  -    if (id == ATTR_ID) {
  +    if (name == HTMLAttributes::idAttr())
   	element->updateId(a->value(), nullAtom);
  -    }
   
  -    removeAttribute(id);
  +    removeAttribute(name);
       return r;
   }
   
  @@ -906,36 +901,22 @@
       return attrs[index]->attrImpl();
   }
   
  -AttributeImpl* NamedAttrMapImpl::getAttributeItem(NodeImpl::Id id) const
  +AttributeImpl* NamedAttrMapImpl::getAttributeItem(const QualifiedName& name) const
   {
  -    bool matchAnyNamespace = (namespacePart(id) == anyNamespace);
       for (unsigned long i = 0; i < len; ++i) {
  -        if (attrs[i]->id() == id)
  +        if (attrs[i]->name().matches(name))
               return attrs[i];
  -        else if (matchAnyNamespace) {
  -            if (localNamePart(attrs[i]->id()) == localNamePart(id))
  -                return attrs[i];
  -        }
       }
       return 0;
   }
   
  -NodeImpl::Id NamedAttrMapImpl::mapId(const DOMString& namespaceURI,
  -                                     const DOMString& localName, bool readonly)
  -{
  -    assert(element);
  -    if (!element) return 0;
  -    return element->getDocument()->attrId(namespaceURI.implementation(),
  -                                            localName.implementation(), readonly);
  -}
  -
   void NamedAttrMapImpl::clearAttributes()
   {
       if (attrs) {
           uint i;
           for (i = 0; i < len; i++) {
  -            if (attrs[i]->_impl)
  -                attrs[i]->_impl->m_element = 0;
  +            if (attrs[i]->m_impl)
  +                attrs[i]->m_impl->m_element = 0;
               attrs[i]->deref();
           }
           main_thread_free(attrs);
  @@ -960,8 +941,8 @@
       // If assigning the map changes the id attribute, we need to call
       // updateId.
   
  -    AttributeImpl *oldId = getAttributeItem(ATTR_ID);
  -    AttributeImpl *newId = other.getAttributeItem(ATTR_ID);
  +    AttributeImpl *oldId = getAttributeItem(HTMLAttributes::idAttr());
  +    AttributeImpl *newId = other.getAttributeItem(HTMLAttributes::idAttr());
   
       if (oldId || newId) {
   	element->updateId(oldId ? oldId->value() : nullAtom, newId ? newId->value() : nullAtom);
  @@ -1001,7 +982,7 @@
       attrs[len++] = attr;
       attr->ref();
   
  -    AttrImpl * const attrImpl = attr->_impl;
  +    AttrImpl * const attrImpl = attr->m_impl;
       if (attrImpl)
           attrImpl->m_element = element;
   
  @@ -1014,11 +995,11 @@
       }
   }
   
  -void NamedAttrMapImpl::removeAttribute(NodeImpl::Id id)
  +void NamedAttrMapImpl::removeAttribute(const QualifiedName& name)
   {
       unsigned long index = len+1;
       for (unsigned long i = 0; i < len; ++i)
  -        if (attrs[i]->id() == id) {
  +        if (attrs[i]->name().matches(name)) {
               index = i;
               break;
           }
  @@ -1027,8 +1008,8 @@
   
       // Remove the attribute from the list
       AttributeImpl* attr = attrs[index];
  -    if (attrs[index]->_impl)
  -        attrs[index]->_impl->m_element = 0;
  +    if (attrs[index]->m_impl)
  +        attrs[index]->m_impl->m_element = 0;
       if (len == 1) {
           main_thread_free(attrs);
           attrs = 0;
  @@ -1048,11 +1029,11 @@
   
       // Notify the element that the attribute has been removed
       // dispatch appropriate mutation events
  -    if (element && !attr->_value.isNull()) {
  -        AtomicString value = attr->_value;
  -        attr->_value = nullAtom;
  +    if (element && !attr->m_value.isNull()) {
  +        AtomicString value = attr->m_value;
  +        attr->m_value = nullAtom;
           element->attributeChanged(attr);
  -        attr->_value = value;
  +        attr->m_value = value;
       }
       if (element) {
           element->dispatchAttrRemovalEvent(attr);
  @@ -1077,7 +1058,8 @@
       
       QPtrDict<QPtrDict<CSSMappedAttributeDeclarationImpl> >* attrNameDict = m_mappedAttributeDecls->find((void*)entryType);
       if (attrNameDict) {
  -        QPtrDict<CSSMappedAttributeDeclarationImpl>* attrValueDict = attrNameDict->find((void*)attr->id());
  +        QPtrDict<CSSMappedAttributeDeclarationImpl>* attrValueDict = 
  +            attrNameDict->find((void*)attr->name().localName().implementation());
           if (attrValueDict)
               return attrValueDict->find(attr->value().implementation());
       }
  @@ -1097,17 +1079,18 @@
           m_mappedAttributeDecls->insert((void*)entryType, attrNameDict);
       }
       else
  -        attrValueDict = attrNameDict->find((void*)attr->id());
  +        attrValueDict = attrNameDict->find((void*)attr->name().localName().implementation());
       if (!attrValueDict) {
           attrValueDict = new QPtrDict<CSSMappedAttributeDeclarationImpl>;
           if (entryType == ePersistent)
               attrValueDict->setAutoDelete(true);
  -        attrNameDict->insert((void*)attr->id(), attrValueDict);
  +        attrNameDict->insert((void*)attr->name().localName().implementation(), attrValueDict);
       }
       attrValueDict->replace(attr->value().implementation(), decl);
   }
   
  -void StyledElementImpl::removeMappedAttributeDecl(MappedAttributeEntry entryType, NodeImpl::Id attrName, const AtomicString& attrValue)
  +void StyledElementImpl::removeMappedAttributeDecl(MappedAttributeEntry entryType,
  +                                                  const QualifiedName& attrName, const AtomicString& attrValue)
   {
       if (!m_mappedAttributeDecls)
           return;
  @@ -1115,7 +1098,7 @@
       QPtrDict<QPtrDict<CSSMappedAttributeDeclarationImpl> >* attrNameDict = m_mappedAttributeDecls->find((void*)entryType);
       if (!attrNameDict)
           return;
  -    QPtrDict<CSSMappedAttributeDeclarationImpl>* attrValueDict = attrNameDict->find((void*)attrName);
  +    QPtrDict<CSSMappedAttributeDeclarationImpl>* attrValueDict = attrNameDict->find((void*)attrName.localName().implementation());
       if (!attrValueDict)
           return;
       attrValueDict->remove(attrValue.implementation());
  @@ -1132,7 +1115,7 @@
           m_isStyleAttributeValid = true;
           m_synchronizingStyleAttribute = true;
           if (m_inlineStyleDecl)
  -            const_cast<StyledElementImpl*>(this)->setAttribute(ATTR_STYLE, m_inlineStyleDecl->cssText());
  +            const_cast<StyledElementImpl*>(this)->setAttribute(HTMLAttributes::style(), m_inlineStyleDecl->cssText());
           m_synchronizingStyleAttribute = false;
       }
   }
  @@ -1145,7 +1128,7 @@
   
   AttributeImpl* MappedAttributeImpl::clone(bool preserveDecl) const
   {
  -    return new MappedAttributeImpl(m_id, _value, preserveDecl ? m_styleDecl : 0);
  +    return new MappedAttributeImpl(m_name, m_value, preserveDecl ? m_styleDecl : 0);
   }
   
   NamedMappedAttrMapImpl::NamedMappedAttrMapImpl(ElementImpl *e)
  @@ -1185,7 +1168,7 @@
       for (uint i = 0; i < length(); i++) {
           MappedAttributeImpl* attr = attributeItem(i);
           if (attr->decl()) {
  -            AttributeImpl* otherAttr = otherMap->getAttributeItem(attr->id());
  +            AttributeImpl* otherAttr = otherMap->getAttributeItem(attr->name());
               if (!otherAttr || (attr->value() != otherAttr->value()))
                   return false;
           }
  @@ -1240,9 +1223,9 @@
       destroyInlineStyleDecl();
   }
   
  -AttributeImpl* StyledElementImpl::createAttribute(NodeImpl::Id id, DOMStringImpl* value)
  +AttributeImpl* StyledElementImpl::createAttribute(const QualifiedName& name, DOMStringImpl* value)
   {
  -    return new MappedAttributeImpl(id, value);
  +    return new MappedAttributeImpl(name, value);
   }
   
   void StyledElementImpl::createInlineStyleDecl()
  @@ -1276,7 +1259,7 @@
   
       bool checkDecl = true;
       MappedAttributeEntry entry;
  -    bool needToParse = mapToEntry(attr->id(), entry);
  +    bool needToParse = mapToEntry(attr->name(), entry);
       if (preserveDecls) {
           if (mappedAttr->decl()) {
               setChanged();
  @@ -1303,7 +1286,7 @@
       if (checkDecl && mappedAttr->decl()) {
           // Add the decl to the table in the appropriate spot.
           setMappedAttributeDecl(entry, attr, mappedAttr->decl());
  -        mappedAttr->decl()->setMappedState(entry, attr->id(), attr->value());
  +        mappedAttr->decl()->setMappedState(entry, attr->name(), attr->value());
           mappedAttr->decl()->setParent(0);
           mappedAttr->decl()->setNode(0);
           if (namedAttrMap)
  @@ -1311,37 +1294,34 @@
       }
   }
   
  -bool StyledElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
  +bool StyledElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
   {
       result = eNone;
  -    if (attr == ATTR_STYLE)
  +    if (attrName == HTMLAttributes::style())
           return !m_synchronizingStyleAttribute;
       return true;
   }
   
   void StyledElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
   {
  -    switch (attr->id()) {
  -    case ATTR_ID:
  +    if (attr->name() == HTMLAttributes::idAttr()) {
           // unique id
           setHasID(!attr->isNull());
           if (namedAttrMap) {
               if (attr->isNull())
                   namedAttrMap->setID(nullAtom);
  -            else if (getDocument()->inCompatMode() && !attr->value().implementation()->isLower())
  +            else if (getDocument() && getDocument()->inCompatMode() && !attr->value().implementation()->isLower())
                   namedAttrMap->setID(AtomicString(attr->value().domString().lower()));
               else
                   namedAttrMap->setID(attr->value());
           }
           setChanged();
  -        break;
  -    case ATTR_CLASS:
  +    } else if (attr->name() == HTMLAttributes::classAttr()) {
           // class
           setHasClass(!attr->isNull());
           if (namedAttrMap) static_cast<NamedMappedAttrMapImpl*>(namedAttrMap)->parseClassAttribute(attr->value());
           setChanged();
  -        break;
  -    case ATTR_STYLE:
  +    } else if (attr->name() == HTMLAttributes::style()) {
           setHasStyle(!attr->isNull());
           if (attr->isNull())
               destroyInlineStyleDecl();
  @@ -1349,9 +1329,6 @@
               getInlineStyleDecl()->parseDeclaration(attr->value());
           m_isStyleAttributeValid = true;
           setChanged();
  -        break;
  -    default:
  -        break;
       }
   }
   
  
  
  
  1.46      +40 -41    WebCore/khtml/xml/dom_elementimpl.h
  
  Index: dom_elementimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_elementimpl.h,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- dom_elementimpl.h	12 Jul 2005 20:26:42 -0000	1.45
  +++ dom_elementimpl.h	18 Jul 2005 21:44:28 -0000	1.46
  @@ -65,37 +65,37 @@
   
   public:
       // null value is forbidden !
  -    AttributeImpl(NodeImpl::Id id, const AtomicString& value)
  -        : m_id(id), _value(value), _impl(0)
  +    AttributeImpl(const QualifiedName& name, const AtomicString& value)
  +        : m_name(name), m_value(value), m_impl(0)
           { };
       virtual ~AttributeImpl() {};
       
       MAIN_THREAD_ALLOCATED;
   
  -    const AtomicString& value() const { return _value; }
  -    const AtomicString& prefix() const { return _prefix; }
  -    NodeImpl::Id id() const { return m_id; }
  -    AttrImpl* attrImpl() const { return _impl; }
  +    const AtomicString& value() const { return m_value; }
  +    const AtomicString& prefix() const { return m_name.prefix(); }
  +    const AtomicString& localName() const { return m_name.localName(); }
  +    const AtomicString& namespaceURI() const { return m_name.namespaceURI(); }
  +    
  +    const QualifiedName& name() const { return m_name; }
  +    
  +    AttrImpl* attrImpl() const { return m_impl; }
   
  -    bool isNull() const { return _value.isNull(); }
  -    bool isEmpty() const { return _value.isEmpty(); }
  +    bool isNull() const { return m_value.isNull(); }
  +    bool isEmpty() const { return m_value.isEmpty(); }
       
       virtual AttributeImpl* clone(bool preserveDecl=true) const;
   
   private:
  -    void setValue(const AtomicString& value) {
  -        _value = value;
  -    }
  -    void setPrefix(const AtomicString& prefix) {
  -        _prefix = prefix;
  -    }
  +    void setValue(const AtomicString& value) { m_value = value; }
  +    void setPrefix(const AtomicString& prefix) { m_name.setPrefix(prefix); }
  +
       void allocateImpl(ElementImpl* e);
   
   protected:
  -    NodeImpl::Id m_id;
  -    AtomicString _prefix;
  -    AtomicString _value;
  -    AttrImpl* _impl;
  +    QualifiedName m_name;
  +    AtomicString m_value;
  +    AttrImpl* m_impl;
   };
   
   // Attr can have Text and EntityReference children
  @@ -130,7 +130,7 @@
       virtual DOMString nodeName() const;
       virtual unsigned short nodeType() const;
       virtual const AtomicString& prefix() const;
  -    virtual void setPrefix(const AtomicString &_prefix, int &exceptioncode );
  +    virtual void setPrefix(const AtomicString &_prefix, int &exceptioncode);
   
       virtual DOMString nodeValue() const;
       virtual void setNodeValue( const DOMString &, int &exceptioncode );
  @@ -163,9 +163,9 @@
       // Used to quickly determine whether or not an element has a given CSS class.
       virtual const AtomicStringList* getClassList() const;
       const AtomicString& getIDAttribute() const;
  -    const AtomicString& getAttribute(Id id ) const;
  -    void setAttribute( Id id, DOMStringImpl* value, int &exceptioncode );
  -    void removeAttribute( Id id, int &exceptioncode );
  +    const AtomicString& getAttribute(const QualifiedName& name) const;
  +    void setAttribute(const QualifiedName& name, DOMStringImpl* value, int &exceptioncode);
  +    void removeAttribute(const QualifiedName& name, int &exceptioncode);
   
       bool hasAttributes() const;
   
  @@ -210,7 +210,7 @@
       virtual void removedFromDocument();
   
       // convenience methods which ignore exceptions
  -    void setAttribute(Id id, const DOMString &value);
  +    void setAttribute(const QualifiedName& name, const DOMString &value);
   
       virtual NamedAttrMapImpl *attributes() const;
       NamedAttrMapImpl* attributes(bool readonly) const;
  @@ -232,7 +232,7 @@
       virtual void mouseEventHandler( MouseEvent */*ev*/, bool /*inside*/ ) {};
       virtual bool childTypeAllowed( unsigned short type );
    
  -    virtual AttributeImpl* createAttribute(Id id, DOMStringImpl* value);
  +    virtual AttributeImpl* createAttribute(const QualifiedName& name, DOMStringImpl* value);
       
       void dispatchAttrRemovalEvent(AttributeImpl *attr);
       void dispatchAttrAdditionEvent(AttributeImpl *attr);
  @@ -276,24 +276,23 @@
       NamedAttrMapImpl &operator =(const NamedAttrMapImpl &other);
   
       // DOM methods & attributes for NamedNodeMap
  -    virtual AttrImpl *getNamedItem ( NodeImpl::Id id ) const;
  +    virtual AttrImpl* getNamedItem(const QualifiedName& name) const;
   
  -    virtual SharedPtr<NodeImpl> removeNamedItem ( NodeImpl::Id id, int &exceptioncode );
  -    virtual SharedPtr<NodeImpl> setNamedItem ( NodeImpl* arg, int &exceptioncode );
  +    virtual SharedPtr<NodeImpl> removeNamedItem(const QualifiedName& name, int &exceptioncode);
  +    virtual SharedPtr<NodeImpl> setNamedItem(NodeImpl* arg, int &exceptioncode);
   
       virtual AttrImpl *item ( unsigned long index ) const;
       unsigned long length() const { return len; }
   
       // Other methods (not part of DOM)
  -    virtual NodeImpl::Id mapId(const DOMString& namespaceURI,  const DOMString& localName,  bool readonly);
       AttributeImpl* attributeItem(unsigned long index) const { return attrs ? attrs[index] : 0; }
  -    AttributeImpl* getAttributeItem(NodeImpl::Id id) const;
  +    AttributeImpl* getAttributeItem(const QualifiedName& name) const;
       virtual bool isReadOnly() { return element ? element->isReadOnly() : false; }
   
       // used during parsing: only inserts if not already there
       // no error checking!
       void insertAttribute(AttributeImpl* newAttribute) {
  -        if (!getAttributeItem(newAttribute->id()))
  +        if (!getAttributeItem(newAttribute->name()))
               addAttribute(newAttribute);
           else
               newAttribute->deref();
  @@ -308,7 +307,7 @@
       // this method is internal, does no error checking at all
       void addAttribute(AttributeImpl* newAttribute);
       // this method is internal, does no error checking at all
  -    void removeAttribute(NodeImpl::Id id);
  +    void removeAttribute(const QualifiedName& name);
       virtual void clearAttributes();
       void detachFromElement();
   
  @@ -327,29 +326,29 @@
   {
   public:
       CSSMappedAttributeDeclarationImpl(CSSRuleImpl *parentRule)
  -    : CSSMutableStyleDeclarationImpl(parentRule), m_entryType(eNone), m_attrName(0)
  +    : CSSMutableStyleDeclarationImpl(parentRule), m_entryType(eNone), m_attrName(anyQName())
       {}
       
       virtual ~CSSMappedAttributeDeclarationImpl();
   
  -    void setMappedState(MappedAttributeEntry type, NodeImpl::Id attr, const AtomicString& val)
  +    void setMappedState(MappedAttributeEntry type, const QualifiedName& name, const AtomicString& val)
       {
           m_entryType = type;
  -        m_attrName = attr;
  +        m_attrName = name;
           m_attrValue = val;
       }
   
   private:
       MappedAttributeEntry m_entryType;
  -    NodeImpl::Id m_attrName;
  +    QualifiedName m_attrName;
       AtomicString m_attrValue;
   };
   
   class MappedAttributeImpl : public AttributeImpl
   {
   public:
  -    MappedAttributeImpl(NodeImpl::Id _id, const AtomicString& value, CSSMappedAttributeDeclarationImpl* decl = 0)
  -    : AttributeImpl(_id, value), m_styleDecl(decl)
  +    MappedAttributeImpl(const QualifiedName& name, const AtomicString& value, CSSMappedAttributeDeclarationImpl* decl = 0)
  +    : AttributeImpl(name, value), m_styleDecl(decl)
       {
           if (decl)
               decl->ref();
  @@ -408,7 +407,7 @@
   
       bool hasMappedAttributes() const { return namedAttrMap ? static_cast<NamedMappedAttrMapImpl*>(namedAttrMap)->hasMappedAttributes() : false; }
       const NamedMappedAttrMapImpl* mappedAttributes() const { return static_cast<NamedMappedAttrMapImpl*>(namedAttrMap); }
  -    bool isMappedAttribute(NodeImpl::Id attr) const { MappedAttributeEntry res = eNone; mapToEntry(attr, res); return res != eNone; }
  +    bool isMappedAttribute(const QualifiedName& name) const { MappedAttributeEntry res = eNone; mapToEntry(name, res); return res != eNone; }
   
       void addCSSLength(MappedAttributeImpl* attr, int id, const DOMString &value);
       void addCSSProperty(MappedAttributeImpl* attr, int id, const DOMString &value);
  @@ -420,7 +419,7 @@
       
       static CSSMappedAttributeDeclarationImpl* getMappedAttributeDecl(MappedAttributeEntry type, AttributeImpl* attr);
       static void setMappedAttributeDecl(MappedAttributeEntry type, AttributeImpl* attr, CSSMappedAttributeDeclarationImpl* decl);
  -    static void removeMappedAttributeDecl(MappedAttributeEntry type, NodeImpl::Id attrName, const AtomicString& attrValue);
  +    static void removeMappedAttributeDecl(MappedAttributeEntry type, const QualifiedName& attrName, const AtomicString& attrValue);
       static QPtrDict<QPtrDict<QPtrDict<CSSMappedAttributeDeclarationImpl> > >* m_mappedAttributeDecls;
       
       CSSMutableStyleDeclarationImpl* inlineStyleDecl() const { return m_inlineStyleDecl; }
  @@ -435,9 +434,9 @@
       virtual const AtomicStringList* getClassList() const;
       virtual void attributeChanged(AttributeImpl* attr, bool preserveDecls = false);
       virtual void parseMappedAttribute(MappedAttributeImpl* attr);
  -    virtual bool mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const;
  +    virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
       virtual void createAttributeMap() const;
  -    virtual AttributeImpl* createAttribute(NodeImpl::Id id, DOMStringImpl* value);
  +    virtual AttributeImpl* createAttribute(const QualifiedName& name, DOMStringImpl* value);
   
   protected:
       CSSMutableStyleDeclarationImpl* m_inlineStyleDecl;
  
  
  
  1.159     +9 -10     WebCore/khtml/xml/dom_nodeimpl.cpp
  
  Index: dom_nodeimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- dom_nodeimpl.cpp	16 Jul 2005 06:45:18 -0000	1.158
  +++ dom_nodeimpl.cpp	18 Jul 2005 21:44:28 -0000	1.159
  @@ -26,7 +26,6 @@
   
   #include "dom/dom_exception.h"
   #include "dom/dom2_events.h"
  -#include "misc/htmlattrs.h"
   #include "xml/dom_elementimpl.h"
   #include "xml/dom_textimpl.h"
   #include "xml/dom2_eventsimpl.h"
  @@ -281,7 +280,7 @@
   
   const AtomicString& NodeImpl::namespaceURI() const
   {
  -    return emptyAtom;
  +    return nullAtom;
   }
   
   void NodeImpl::setFirstChild(NodeImpl *)
  @@ -1603,10 +1602,10 @@
   
   #ifndef NDEBUG
   
  -static void appendAttributeDesc(const NodeImpl *node, QString &string, NodeImpl::Id attrID, QString attrDesc)
  +static void appendAttributeDesc(const NodeImpl *node, QString &string, const QualifiedName& name, QString attrDesc)
   {
       if (node->isElementNode()) {
  -        DOMString attr = static_cast<const ElementImpl *>(node)->getAttribute(attrID);
  +        DOMString attr = static_cast<const ElementImpl *>(node)->getAttribute(name);
           if (!attr.isEmpty()) {
               string += attrDesc;
               string += attr.string();
  @@ -1625,8 +1624,8 @@
           fprintf(stderr, "%s%s\t%p \"%s\"\n", prefix, nodeName().string().local8Bit().data(), this, value.local8Bit().data());
       } else {
           QString attrs = "";
  -        appendAttributeDesc(this, attrs, ATTR_CLASS, " CLASS=");
  -        appendAttributeDesc(this, attrs, ATTR_STYLE, " STYLE=");
  +        appendAttributeDesc(this, attrs, HTMLAttributes::classAttr(), " CLASS=");
  +        appendAttributeDesc(this, attrs, HTMLAttributes::style(), " STYLE=");
           fprintf(stderr, "%s%s\t%p%s\n", prefix, nodeName().string().local8Bit().data(), this, attrs.ascii());
       }
   }
  @@ -2578,9 +2577,9 @@
       return recursiveItem( index );
   }
   
  -bool NameNodeListImpl::nodeMatches( NodeImpl *testNode ) const
  +bool NameNodeListImpl::nodeMatches(NodeImpl *testNode) const
   {
  -    return static_cast<ElementImpl *>(testNode)->getAttribute(ATTR_NAME) == nodeName;
  +    return static_cast<ElementImpl *>(testNode)->getAttribute(HTMLAttributes::name()) == nodeName;
   }
   
   // ---------------------------------------------------------------------------
  @@ -2591,12 +2590,12 @@
   
   NodeImpl *NamedNodeMapImpl::getNamedItemNS(const DOMString &namespaceURI, const DOMString &localName) const
   {
  -    return getNamedItem(const_cast<NamedNodeMapImpl *>(this)->mapId(namespaceURI, localName, true));
  +    return getNamedItem(QualifiedName(nullAtom, localName.implementation(), namespaceURI.implementation()));
   }
   
   SharedPtr<NodeImpl> NamedNodeMapImpl::removeNamedItemNS(const DOMString &namespaceURI, const DOMString &localName, int &exception)
   {
  -    return removeNamedItem(mapId(namespaceURI, localName, true), exception);
  +    return removeNamedItem(QualifiedName(nullAtom, localName.implementation(), namespaceURI.implementation()), exception);
   }
   
   }
  
  
  
  1.90      +3 -21     WebCore/khtml/xml/dom_nodeimpl.h
  
  Index: dom_nodeimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.h,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- dom_nodeimpl.h	16 Jul 2005 06:45:18 -0000	1.89
  +++ dom_nodeimpl.h	18 Jul 2005 21:44:29 -0000	1.90
  @@ -62,21 +62,6 @@
   class QualifiedName;
   class RegisteredEventListener;
   
  -const Q_UINT16 noNamespace = 0;
  -const Q_UINT16 anyNamespace = 1;
  -const Q_UINT16 xhtmlNamespace = 2;
  -const Q_UINT16 anyLocalName = 0;
  -
  -const Q_UINT32 namespaceMask = 0xFFFF0000U;
  -const Q_UINT32 localNameMask = 0x0000FFFFU;
  -
  -inline Q_UINT16 namespacePart(Q_UINT32 i) { return i >> 16; }
  -inline Q_UINT16 localNamePart(Q_UINT32 i) { return i; }
  -inline Q_UINT32 makeId(Q_UINT16 n, Q_UINT16 l) { return (n << 16) | l; }
  -
  -// Can't use makeId here because it results in an "initroutine".
  -const Q_UINT32 anyQName = anyNamespace << 16 | anyLocalName;
  -
   class DocumentPtr : public khtml::Shared<DocumentPtr>
   {
   public:
  @@ -199,8 +184,6 @@
       // until they know all of their nested <param>s. [3603191, 4040848]
       virtual void closeRenderer() {}
   
  -    typedef Q_UINT32 Id; // FIXME: Yank this once attributes are also switched over.
  -
       enum MouseEventType {
           MousePress,
           MouseRelease,
  @@ -645,15 +628,14 @@
       SharedPtr<NodeImpl> removeNamedItemNS(const DOMString &namespaceURI, const DOMString &localName, int &exception);
   
       // DOM methods & attributes for NamedNodeMap
  -    virtual NodeImpl *getNamedItem ( NodeImpl::Id id ) const = 0;
  -    virtual SharedPtr<NodeImpl> removeNamedItem ( NodeImpl::Id id, int &exceptioncode ) = 0;
  -    virtual SharedPtr<NodeImpl> setNamedItem ( NodeImpl* arg, int &exceptioncode ) = 0;
  +    virtual NodeImpl *getNamedItem(const QualifiedName& attrName) const = 0;
  +    virtual SharedPtr<NodeImpl> removeNamedItem (const QualifiedName& attrName, int &exceptioncode) = 0;
  +    virtual SharedPtr<NodeImpl> setNamedItem (NodeImpl* arg, int &exceptioncode) = 0;
   
       virtual NodeImpl *item ( unsigned long index ) const = 0;
       virtual unsigned long length(  ) const = 0;
   
       // Other methods (not part of DOM)
  -    virtual NodeImpl::Id mapId(const DOMString& namespaceURI,  const DOMString& localName,  bool readonly) = 0;
       virtual bool isReadOnly() { return false; }
   };
   
  
  
  
  1.4       +23 -0     WebCore/khtml/xml/dom_qname.cpp
  
  Index: dom_qname.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_qname.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dom_qname.cpp	9 Jul 2005 20:19:22 -0000	1.3
  +++ dom_qname.cpp	18 Jul 2005 21:44:29 -0000	1.4
  @@ -19,6 +19,8 @@
    * Boston, MA 02111-1307, USA.
    */
   
  +#define KHTML_QNAME_HIDE_GLOBALS 1
  +
   #include "dom_qname.h"
   #include "misc/hashset.h"
   
  @@ -150,4 +152,25 @@
       *this = other;
   }
   
  +DOMString QualifiedName::toString() const
  +{
  +    DOMString local = localName();
  +    if (hasPrefix())
  +        return DOMString(prefix()) + ":" + local;
  +    return local;
  +}
  +
  +// Global init routines
  +void* anyName[(sizeof(QualifiedName) + sizeof(void*) - 1) / sizeof(void*)];
  +
  +void QualifiedName::init()
  +{
  +    static bool initialized;
  +    if (!initialized) {
  +        // Use placement new to initialize the globals.
  +        new (&anyName) QualifiedName(nullAtom, starAtom, starAtom);
  +        initialized = true;
  +    }
  +}
  +
   }
  
  
  
  1.4       +10 -1     WebCore/khtml/xml/dom_qname.h
  
  Index: dom_qname.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_qname.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dom_qname.h	9 Jul 2005 20:19:22 -0000	1.3
  +++ dom_qname.h	18 Jul 2005 21:44:29 -0000	1.4
  @@ -38,7 +38,6 @@
       };
   
       QualifiedName(const AtomicString& p, const AtomicString& l, const AtomicString& n);
  -    QualifiedName(QualifiedNameImpl* inner);
       ~QualifiedName();
   
       QualifiedName(const QualifiedName& other);
  @@ -56,6 +55,11 @@
       const AtomicString& localName() const { return m_impl->m_localName; }
       const AtomicString& namespaceURI() const { return m_impl->m_namespace; }
   
  +    DOMString toString() const;
  +
  +    // Init routine for globals
  +    static void init();
  +
   private:
   
       void ref() { m_impl->ref(); } 
  @@ -64,6 +68,11 @@
       QualifiedNameImpl* m_impl;
   };
   
  +#if !KHTML_QNAME_HIDE_GLOBALS
  +extern const QualifiedName anyName;
  +inline const QualifiedName& anyQName() { return anyName; }
  +#endif
  +
   inline bool operator==(const AtomicString& a, const QualifiedName& q) { return a == q.localName(); }
   inline bool operator!=(const AtomicString& a, const QualifiedName& q) { return a != q.localName(); }
   inline bool operator==(const QualifiedName& q, const AtomicString& a) { return a == q.localName(); }
  
  
  
  1.25      +0 -1      WebCore/khtml/xml/dom_textimpl.cpp
  
  Index: dom_textimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.cpp,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- dom_textimpl.cpp	9 Jul 2005 20:19:22 -0000	1.24
  +++ dom_textimpl.cpp	18 Jul 2005 21:44:29 -0000	1.25
  @@ -27,7 +27,6 @@
   #include "xml/dom_textimpl.h"
   #include "xml/dom_docimpl.h"
   
  -#include "misc/htmlhashes.h"
   #include "rendering/render_text.h"
   
   #include <kdebug.h>
  
  
  
  1.33      +11 -16    WebCore/khtml/xml/xml_tokenizer.cpp
  
  Index: xml_tokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- xml_tokenizer.cpp	9 Jul 2005 20:19:22 -0000	1.32
  +++ xml_tokenizer.cpp	18 Jul 2005 21:44:29 -0000	1.33
  @@ -27,7 +27,6 @@
   #include "html/html_headimpl.h"
   #include "html/html_tableimpl.h"
   #include "htmlnames.h"
  -#include "misc/htmlattrs.h"
   #include "misc/loader.h"
   
   #include "khtmlview.h"
  @@ -44,12 +43,15 @@
   using DOM::DocumentPtr;
   using DOM::DOMString;
   using DOM::ElementImpl;
  +using DOM::HTMLAttributes;
   using DOM::HTMLNames;
   using DOM::HTMLScriptElementImpl;
   using DOM::HTMLTableSectionElementImpl;
   using DOM::Node;
   using DOM::NodeImpl;
  +using DOM::nullAtom;
   using DOM::ProcessingInstructionImpl;
  +using DOM::QualifiedName;
   using DOM::TextImpl;
   
   namespace khtml {
  @@ -308,14 +310,11 @@
   
       int i;
       for (i = 0; i < atts.length(); i++) {
  -        // FIXME: qualified name not supported for attributes! The prefix has been lost.
           DOMString uri(atts.uri(i));
  -        DOMString ln(atts.localName(i));
  +        DOMString qn(atts.qName(i));
           DOMString val(atts.value(i));
  -        NodeImpl::Id id = m_doc->document()->attrId(uri.implementation(),
  -                                                    ln.implementation(),
  -                                                    false /* allocate */);
  -        newElement->setAttribute(id, val.implementation(), exceptioncode);
  +        
  +        newElement->setAttributeNS(uri.implementation(), qn.implementation(), val.implementation(), exceptioncode);
           if (exceptioncode) // exception setting attributes
               return;
       }
  @@ -347,10 +346,6 @@
           delete newElement;
           return;
       }
  -
  -    // ### DOM spec states: "if there is no markup inside an element's content, the text is contained in a
  -    // single object implementing the Text interface that is the only child of the element."... do we
  -    // need to ensure that empty elements always have an empty text child?
   }
   
   void XMLTokenizer::endElement()
  @@ -620,12 +615,12 @@
       }
   
       ElementImpl* reportElement = doc->createElementNS(HTMLNames::xhtmlNamespaceURI(), "parsererror", exceptioncode);
  -    reportElement->setAttribute(ATTR_STYLE, "white-space: pre; border: 2px solid #c77; padding: 0 1em 0 1em; margin: 1em; background-color: #fdd; color: black");
  +    reportElement->setAttribute(HTMLAttributes::style(), "white-space: pre; border: 2px solid #c77; padding: 0 1em 0 1em; margin: 1em; background-color: #fdd; color: black");
       ElementImpl* h3 = doc->createElementNS(HTMLNames::xhtmlNamespaceURI(), "h3", exceptioncode);
       h3->appendChild(doc->createTextNode("This page contains the following errors:"), exceptioncode);
       reportElement->appendChild(h3, exceptioncode);
       ElementImpl* fixed = doc->createElementNS(HTMLNames::xhtmlNamespaceURI(), "div", exceptioncode);
  -    fixed->setAttribute(ATTR_STYLE, "font-family:monospace;font-size:12px");
  +    fixed->setAttribute(HTMLAttributes::style(), "font-family:monospace;font-size:12px");
       NodeImpl* textNode = doc->createTextNode(m_errorMessages);
       fixed->appendChild(textNode, exceptioncode);
       reportElement->appendChild(fixed, exceptioncode);
  @@ -637,7 +632,7 @@
       if (doc->transformSourceDocument()) {
           ElementImpl* par = doc->createElementNS(HTMLNames::xhtmlNamespaceURI(), "p", exceptioncode);
           reportElement->appendChild(par, exceptioncode);
  -        par->setAttribute(ATTR_STYLE, "white-space: normal");
  +        par->setAttribute(HTMLAttributes::style(), "white-space: normal");
           par->appendChild(doc->createTextNode("This document was created as the result of an XSL transformation. The line and column numbers given are from the transformed result."), exceptioncode);
       }
   #endif
  @@ -667,8 +662,8 @@
       // and continue where it left off). For scripts that don't have a src attribute, execute the code
       // inside the tag
       while (m_scriptsIt->current()) {
  -        DOMString scriptSrc = m_scriptsIt->current()->getAttribute(ATTR_SRC);
  -        QString charset = m_scriptsIt->current()->getAttribute(ATTR_CHARSET).string();
  +        DOMString scriptSrc = m_scriptsIt->current()->getAttribute(HTMLAttributes::src());
  +        QString charset = m_scriptsIt->current()->getAttribute(HTMLAttributes::charset()).string();
   
   	// don't load external scripts for standalone documents (for now)
           if (scriptSrc != "" && m_doc->document()->part()) {
  
  
  
  1.7       +2 -2      WebCore/kwq/DOMHTML.h
  
  Index: DOMHTML.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/DOMHTML.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DOMHTML.h	13 May 2004 23:58:42 -0000	1.6
  +++ DOMHTML.h	18 Jul 2005 21:44:30 -0000	1.7
  @@ -254,8 +254,8 @@
   - (void)setName:(NSString *)name;
   - (BOOL)readOnly;
   - (void)setReadOnly:(BOOL)readOnly;
  -- (NSString *)size;
  -- (void)setSize:(NSString *)size;
  +- (unsigned long)size;
  +- (void)setSize:(unsigned long)size;
   - (NSString *)src;
   - (void)setSrc:(NSString *)src;
   - (long)tabIndex;
  
  
  
  1.20      +471 -472  WebCore/kwq/DOMHTML.mm
  
  Index: DOMHTML.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/DOMHTML.mm,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DOMHTML.mm	9 Jul 2005 20:19:24 -0000	1.19
  +++ DOMHTML.mm	18 Jul 2005 21:44:30 -0000	1.20
  @@ -38,7 +38,6 @@
   #import "html_miscimpl.h"
   #import "html_objectimpl.h"
   #import "html_tableimpl.h"
  -#import "htmlattrs.h"
   #import "dom_elementimpl.h"
   #import "dom_nodeimpl.h"
   #import "markup.h"
  @@ -53,6 +52,8 @@
   using DOM::DocumentFragmentImpl;
   using DOM::DOMString;
   using DOM::ElementImpl;
  +using DOM::HTMLAttributes;
  +using DOM::HTMLNames;
   using DOM::HTMLAnchorElementImpl;
   using DOM::HTMLAppletElementImpl;
   using DOM::HTMLAreaElementImpl;
  @@ -113,6 +114,9 @@
   using DOM::NameNodeListImpl;
   using DOM::NodeImpl;
   
  +// FIXME: This code should be using the impl methods instead of doing so many get/setAttribute calls.
  +// FIXME: This code should be generated.
  +
   @interface DOMHTMLCollection (WebCoreInternal)
   + (DOMHTMLCollection *)_collectionWithImpl:(HTMLCollectionImpl *)impl;
   @end
  @@ -289,52 +293,52 @@
   
   - (NSString *)idName
   {
  -    return [self _HTMLElementImpl]->getAttribute(ATTR_ID);
  +    return [self _HTMLElementImpl]->getAttribute(HTMLAttributes::idAttr());
   }
   
   - (void)setIdName:(NSString *)idName
   {
  -    [self _HTMLElementImpl]->setAttribute(ATTR_ID, idName);
  +    [self _HTMLElementImpl]->setAttribute(HTMLAttributes::idAttr(), idName);
   }
   
   - (NSString *)title
   {
  -    return [self _HTMLElementImpl]->getAttribute(ATTR_TITLE);
  +    return [self _HTMLElementImpl]->title();
   }
   
   - (void)setTitle:(NSString *)title
   {
  -    [self _HTMLElementImpl]->setAttribute(ATTR_TITLE, title);
  +    [self _HTMLElementImpl]->setTitle(title);
   }
   
   - (NSString *)lang
   {
  -    return [self _HTMLElementImpl]->getAttribute(ATTR_LANG);
  +    return [self _HTMLElementImpl]->lang();
   }
   
   - (void)setLang:(NSString *)lang
   {
  -    [self _HTMLElementImpl]->setAttribute(ATTR_LANG, lang);
  +    [self _HTMLElementImpl]->setLang(lang);
   }
   
   - (NSString *)dir
   {
  -    return [self _HTMLElementImpl]->getAttribute(ATTR_DIR);
  +    return [self _HTMLElementImpl]->dir();
   }
   
   - (void)setDir:(NSString *)dir
   {
  -    [self _HTMLElementImpl]->setAttribute(ATTR_DIR, dir);
  +    [self _HTMLElementImpl]->setDir(dir);
   }
   
   - (NSString *)className
   {
  -    return [self _HTMLElementImpl]->getAttribute(ATTR_CLASS);
  +    return [self _HTMLElementImpl]->className();
   }
   
   - (void)setClassName:(NSString *)className
   {
  -    [self _HTMLElementImpl]->setAttribute(ATTR_CLASS, className);
  +    [self _HTMLElementImpl]->setClassName(className);
   }
   
   @end
  @@ -567,12 +571,12 @@
   
   - (NSString *)version
   {
  -    return [self _HTMLHtmlElementImpl]->getAttribute(ATTR_VERSION);
  +    return [self _HTMLHtmlElementImpl]->version();
   }
   
   - (void)setVersion:(NSString *)version
   {
  -    [self _HTMLHtmlElementImpl]->setAttribute(ATTR_VERSION, version);
  +    [self _HTMLHtmlElementImpl]->setVersion(version);
   }
   
   @end
  @@ -586,12 +590,12 @@
   
   - (NSString *)profile
   {
  -    return [self _headElementImpl]->getAttribute(ATTR_PROFILE);
  +    return [self _headElementImpl]->profile();
   }
   
   - (void)setProfile:(NSString *)profile
   {
  -    [self _headElementImpl]->setAttribute(ATTR_PROFILE, profile);
  +    [self _headElementImpl]->setProfile(profile);
   }
   
   @end
  @@ -605,23 +609,22 @@
   
   - (BOOL)disabled
   {
  -    return ![self _linkElementImpl]->getAttribute(ATTR_DISABLED).isNull();
  +    return ![self _linkElementImpl]->disabled();
   }
   
   - (void)setDisabled:(BOOL)disabled
   {
  -    [self _linkElementImpl]->setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  -    [self _linkElementImpl]->setDisabledState(disabled);
  +    [self _linkElementImpl]->setDisabled(disabled);
   }
   
   - (NSString *)charset
   {
  -    return [self _linkElementImpl]->getAttribute(ATTR_CHARSET);
  +    return [self _linkElementImpl]->charset();
   }
   
   - (void)setCharset:(NSString *)charset
   {
  -    [self _linkElementImpl]->setAttribute(ATTR_CHARSET, charset);
  +    [self _linkElementImpl]->setCharset(charset);
   }
   
   - (NSString *)href
  @@ -631,67 +634,67 @@
   
   - (void)setHref:(NSString *)href
   {
  -    [self _linkElementImpl]->setAttribute(ATTR_HREF, href);
  +    [self _linkElementImpl]->href();
   }
   
   - (NSString *)hreflang
   {
  -    return [self _linkElementImpl]->getAttribute(ATTR_HREFLANG);
  +    return [self _linkElementImpl]->hreflang();
   }
   
   - (void)setHreflang:(NSString *)hreflang
   {
  -   [self _linkElementImpl]->setAttribute(ATTR_HREFLANG, hreflang);
  +    [self _linkElementImpl]->setHreflang(hreflang);
   }
   
   - (NSString *)media
   {
  -    return [self _linkElementImpl]->getAttribute(ATTR_MEDIA);
  +    return [self _linkElementImpl]->getAttribute(HTMLAttributes::media());
   }
   
   - (void)setMedia:(NSString *)media
   {
  -    [self _linkElementImpl]->setAttribute(ATTR_MEDIA, media);
  +    [self _linkElementImpl]->setAttribute(HTMLAttributes::media(), media);
   }
   
   - (NSString *)rel
   {
  -    return [self _linkElementImpl]->getAttribute(ATTR_REL);
  +    return [self _linkElementImpl]->getAttribute(HTMLAttributes::rel());
   }
   
   - (void)setRel:(NSString *)rel
   {
  -    [self _linkElementImpl]->setAttribute(ATTR_REL, rel);
  +    [self _linkElementImpl]->setAttribute(HTMLAttributes::rel(), rel);
   }
   
   - (NSString *)rev
   {
  -    return [self _linkElementImpl]->getAttribute(ATTR_REV);
  +    return [self _linkElementImpl]->getAttribute(HTMLAttributes::rev());
   }
   
   - (void)setRev:(NSString *)rev
   {
  -    [self _linkElementImpl]->setAttribute(ATTR_REV, rev);
  +    [self _linkElementImpl]->setAttribute(HTMLAttributes::rev(), rev);
   }
   
   - (NSString *)target
   {
  -    return [self _linkElementImpl]->getAttribute(ATTR_TARGET);
  +    return [self _linkElementImpl]->getAttribute(HTMLAttributes::target());
   }
   
   - (void)setTarget:(NSString *)target
   {
  -    [self _linkElementImpl]->setAttribute(ATTR_TARGET, target);
  +    [self _linkElementImpl]->setAttribute(HTMLAttributes::target(), target);
   }
   
   - (NSString *)type
   {
  -    return [self _linkElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _linkElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _linkElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _linkElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   @end
  @@ -705,12 +708,12 @@
   
   - (NSString *)text
   {
  -    return [self _titleElementImpl]->getAttribute(ATTR_TEXT);
  +    return [self _titleElementImpl]->getAttribute(HTMLAttributes::text());
   }
   
   - (void)setText:(NSString *)text
   {
  -    [self _titleElementImpl]->setAttribute(ATTR_TEXT, text);
  +    [self _titleElementImpl]->setAttribute(HTMLAttributes::text(), text);
   }
   
   @end
  @@ -724,42 +727,42 @@
   
   - (NSString *)content
   {
  -    return [self _metaElementImpl]->getAttribute(ATTR_CONTENT);
  +    return [self _metaElementImpl]->getAttribute(HTMLAttributes::content());
   }
   
   - (void)setContent:(NSString *)content
   {
  -    [self _metaElementImpl]->setAttribute(ATTR_CONTENT, content);
  +    [self _metaElementImpl]->setAttribute(HTMLAttributes::content(), content);
   }
   
   - (NSString *)httpEquiv
   {
  -    return [self _metaElementImpl]->getAttribute(ATTR_HTTP_EQUIV);
  +    return [self _metaElementImpl]->getAttribute(HTMLAttributes::http_equiv());
   }
   
   - (void)setHttpEquiv:(NSString *)httpEquiv
   {
  -    [self _metaElementImpl]->setAttribute(ATTR_HTTP_EQUIV, httpEquiv);
  +    [self _metaElementImpl]->setAttribute(HTMLAttributes::http_equiv(), httpEquiv);
   }
   
   - (NSString *)name
   {
  -    return [self _metaElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _metaElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _metaElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _metaElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (NSString *)scheme
   {
  -    return [self _metaElementImpl]->getAttribute(ATTR_SCHEME);
  +    return [self _metaElementImpl]->getAttribute(HTMLAttributes::scheme());
   }
   
   - (void)setScheme:(NSString *)scheme
   {
  -    [self _metaElementImpl]->setAttribute(ATTR_SCHEME, scheme);
  +    [self _metaElementImpl]->setAttribute(HTMLAttributes::scheme(), scheme);
   }
   
   @end
  @@ -778,17 +781,17 @@
   
   - (void)setHref:(NSString *)href
   {
  -    [self _baseElementImpl]->setAttribute(ATTR_HREF, href);
  +    [self _baseElementImpl]->setAttribute(HTMLAttributes::href(), href);
   }
   
   - (NSString *)target
   {
  -    return [self _baseElementImpl]->getAttribute(ATTR_TARGET);
  +    return [self _baseElementImpl]->getAttribute(HTMLAttributes::target());
   }
   
   - (void)setTarget:(NSString *)target
   {
  -    [self _baseElementImpl]->setAttribute(ATTR_SCHEME, target);
  +    [self _baseElementImpl]->setAttribute(HTMLAttributes::scheme(), target);
   }
   
   @end
  @@ -802,32 +805,32 @@
   
   - (BOOL)disabled
   {
  -    return ![self _styleElementImpl]->getAttribute(ATTR_DISABLED).isNull();
  +    return ![self _styleElementImpl]->getAttribute(HTMLAttributes::disabled()).isNull();
   }
   
   - (void)setDisabled:(BOOL)disabled
   {
  -    [self _styleElementImpl]->setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    [self _styleElementImpl]->setAttribute(HTMLAttributes::disabled(), disabled ? "" : 0);
   }
   
   - (NSString *)media
   {
  -    return [self _styleElementImpl]->getAttribute(ATTR_MEDIA);
  +    return [self _styleElementImpl]->getAttribute(HTMLAttributes::media());
   }
   
   - (void)setMedia:(NSString *)media
   {
  -    [self _styleElementImpl]->setAttribute(ATTR_MEDIA, media);
  +    [self _styleElementImpl]->setAttribute(HTMLAttributes::media(), media);
   }
   
   - (NSString *)type
   {
  -    return [self _styleElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _styleElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _styleElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _styleElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   @end
  @@ -841,62 +844,62 @@
   
   - (NSString *)aLink
   {
  -    return [self _bodyElementImpl]->getAttribute(ATTR_ALINK);
  +    return [self _bodyElementImpl]->getAttribute(HTMLAttributes::alink());
   }
   
   - (void)setALink:(NSString *)aLink
   {
  -    [self _bodyElementImpl]->setAttribute(ATTR_ALINK, aLink);
  +    [self _bodyElementImpl]->setAttribute(HTMLAttributes::alink(), aLink);
   }
   
   - (NSString *)background
   {
  -    return [self _bodyElementImpl]->getAttribute(ATTR_BACKGROUND);
  +    return [self _bodyElementImpl]->getAttribute(HTMLAttributes::background());
   }
   
   - (void)setBackground:(NSString *)background
   {
  -    [self _bodyElementImpl]->setAttribute(ATTR_BACKGROUND, background);
  +    [self _bodyElementImpl]->setAttribute(HTMLAttributes::background(), background);
   }
   
   - (NSString *)bgColor
   {
  -    return [self _bodyElementImpl]->getAttribute(ATTR_BGCOLOR);
  +    return [self _bodyElementImpl]->getAttribute(HTMLAttributes::bgcolor());
   }
   
   - (void)setBgColor:(NSString *)bgColor
   {
  -    [self _bodyElementImpl]->setAttribute(ATTR_BGCOLOR, bgColor);
  +    [self _bodyElementImpl]->setAttribute(HTMLAttributes::bgcolor(), bgColor);
   }
   
   - (NSString *)link
   {
  -    return [self _bodyElementImpl]->getAttribute(ATTR_LINK);
  +    return [self _bodyElementImpl]->getAttribute(HTMLAttributes::link());
   }
   
   - (void)setLink:(NSString *)link
   {
  -    [self _bodyElementImpl]->setAttribute(ATTR_LINK, link);
  +    [self _bodyElementImpl]->setAttribute(HTMLAttributes::link(), link);
   }
   
   - (NSString *)text
   {
  -    return [self _bodyElementImpl]->getAttribute(ATTR_TEXT);
  +    return [self _bodyElementImpl]->getAttribute(HTMLAttributes::text());
   }
   
   - (void)setText:(NSString *)text
   {
  -    [self _bodyElementImpl]->setAttribute(ATTR_TEXT, text);
  +    [self _bodyElementImpl]->setAttribute(HTMLAttributes::text(), text);
   }
   
   - (NSString *)vLink
   {
  -    return [self _bodyElementImpl]->getAttribute(ATTR_VLINK);
  +    return [self _bodyElementImpl]->getAttribute(HTMLAttributes::vlink());
   }
   
   - (void)setVLink:(NSString *)vLink
   {
  -    [self _bodyElementImpl]->setAttribute(ATTR_VLINK, vLink);
  +    [self _bodyElementImpl]->setAttribute(HTMLAttributes::vlink(), vLink);
   }
   
   @end
  @@ -921,62 +924,62 @@
   
   - (NSString *)name
   {
  -    return [self _formElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _formElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _formElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _formElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (NSString *)acceptCharset
   {
  -    return [self _formElementImpl]->getAttribute(ATTR_ACCEPT_CHARSET);
  +    return [self _formElementImpl]->getAttribute(HTMLAttributes::accept_charset());
   }
   
   - (void)setAcceptCharset:(NSString *)acceptCharset
   {
  -    [self _formElementImpl]->setAttribute(ATTR_ACCEPT_CHARSET, acceptCharset);
  +    [self _formElementImpl]->setAttribute(HTMLAttributes::accept_charset(), acceptCharset);
   }
   
   - (NSString *)action
   {
  -    return [self _formElementImpl]->getAttribute(ATTR_ACTION);
  +    return [self _formElementImpl]->getAttribute(HTMLAttributes::action());
   }
   
   - (void)setAction:(NSString *)action
   {
  -    [self _formElementImpl]->setAttribute(ATTR_ACTION, action);
  +    [self _formElementImpl]->setAttribute(HTMLAttributes::action(), action);
   }
   
   - (NSString *)enctype
   {
  -    return [self _formElementImpl]->getAttribute(ATTR_ENCTYPE);
  +    return [self _formElementImpl]->getAttribute(HTMLAttributes::enctype());
   }
   
   - (void)setEnctype:(NSString *)enctype
   {
  -    [self _formElementImpl]->setAttribute(ATTR_ENCTYPE, enctype);
  +    [self _formElementImpl]->setAttribute(HTMLAttributes::enctype(), enctype);
   }
   
   - (NSString *)method
   {
  -    return [self _formElementImpl]->getAttribute(ATTR_METHOD);
  +    return [self _formElementImpl]->getAttribute(HTMLAttributes::method());
   }
   
   - (void)setMethod:(NSString *)method
   {
  -    [self _formElementImpl]->setAttribute(ATTR_METHOD, method);
  +    [self _formElementImpl]->setAttribute(HTMLAttributes::method(), method);
   }
   
   - (NSString *)target
   {
  -    return [self _formElementImpl]->getAttribute(ATTR_TARGET);
  +    return [self _formElementImpl]->getAttribute(HTMLAttributes::target());
   }
   
   - (void)setTarget:(NSString *)target
   {
  -    [self _formElementImpl]->setAttribute(ATTR_TARGET, target);
  +    [self _formElementImpl]->setAttribute(HTMLAttributes::target(), target);
   }
   
   - (void)submit
  @@ -1014,12 +1017,12 @@
   
   - (NSString *)prompt
   {
  -    return [self _isIndexElementImpl]->getAttribute(ATTR_PROMPT);
  +    return [self _isIndexElementImpl]->prompt();
   }
   
   - (void)setPrompt:(NSString *)prompt
   {
  -    [self _isIndexElementImpl]->setAttribute(ATTR_PROMPT, prompt);
  +    [self _isIndexElementImpl]->setPrompt(prompt);
   }
   
   @end
  @@ -1081,22 +1084,22 @@
   
   - (BOOL)disabled
   {
  -    return ![self _selectElementImpl]->getAttribute(ATTR_DISABLED).isNull();
  +    return ![self _selectElementImpl]->disabled();
   }
   
   - (void)setDisabled:(BOOL)disabled
   {
  -    [self _selectElementImpl]->setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    [self _selectElementImpl]->setDisabled(disabled);
   }
   
   - (BOOL)multiple
   {
  -    return ![self _selectElementImpl]->getAttribute(ATTR_MULTIPLE).isNull();
  +    return ![self _selectElementImpl]->multiple();
   }
   
   - (void)setMultiple:(BOOL)multiple
   {
  -    [self _selectElementImpl]->setAttribute(ATTR_MULTIPLE, multiple ? "" : 0);
  +    [self _selectElementImpl]->setMultiple(multiple);
   }
   
   - (NSString *)name
  @@ -1111,13 +1114,12 @@
   
   - (long)size
   {
  -    return [self _selectElementImpl]->getAttribute(ATTR_SIZE).toInt();
  +    return [self _selectElementImpl]->size();
   }
   
   - (void)setSize:(long)size
   {
  -	DOMString value(QString::number(size));
  -    [self _selectElementImpl]->setAttribute(ATTR_SIZE, value);
  +    [self _selectElementImpl]->setSize(size);
   }
   
   - (long)tabIndex
  @@ -1161,22 +1163,22 @@
   
   - (BOOL)disabled
   {
  -    return ![self _optGroupElementImpl]->getAttribute(ATTR_DISABLED).isNull();
  +    return ![self _optGroupElementImpl]->disabled();
   }
   
   - (void)setDisabled:(BOOL)disabled
   {
  -    [self _optGroupElementImpl]->setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    [self _optGroupElementImpl]->setDisabled(disabled);
   }
   
   - (NSString *)label
   {
  -    return [self _optGroupElementImpl]->getAttribute(ATTR_LABEL);
  +    return [self _optGroupElementImpl]->label();
   }
   
   - (void)setLabel:(NSString *)label
   {
  -    [self _optGroupElementImpl]->setAttribute(ATTR_LABEL, label);
  +    [self _optGroupElementImpl]->setLabel(label);
   }
   
   @end
  @@ -1195,12 +1197,12 @@
   
   - (BOOL)defaultSelected
   {
  -    return ![self _optionElementImpl]->getAttribute(ATTR_SELECTED).isNull();
  +    return ![self _optionElementImpl]->defaultSelected();
   }
   
   - (void)setDefaultSelected:(BOOL)defaultSelected
   {
  -    [self _optionElementImpl]->setAttribute(ATTR_SELECTED, defaultSelected ? "" : 0);
  +    [self _optionElementImpl]->setDefaultSelected(defaultSelected);
   }
   
   - (NSString *)text
  @@ -1215,22 +1217,22 @@
   
   - (BOOL)disabled
   {
  -    return ![self _optionElementImpl]->getAttribute(ATTR_DISABLED).isNull();
  +    return ![self _optionElementImpl]->disabled();
   }
   
   - (void)setDisabled:(BOOL)disabled
   {
  -    [self _optionElementImpl]->setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    [self _optionElementImpl]->setDisabled(disabled);
   }
   
   - (NSString *)label
   {
  -    return [self _optionElementImpl]->getAttribute(ATTR_LABEL);
  +    return [self _optionElementImpl]->label();
   }
   
   - (void)setLabel:(NSString *)label
   {
  -    [self _optionElementImpl]->setAttribute(ATTR_LABEL, label);
  +    [self _optionElementImpl]->setLabel(label);
   }
   
   - (BOOL)selected
  @@ -1265,22 +1267,22 @@
   
   - (NSString *)defaultValue
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_VALUE);
  +    return [self _inputElementImpl]->defaultValue();
   }
   
   - (void)setDefaultValue:(NSString *)defaultValue
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_VALUE, defaultValue);
  +    [self _inputElementImpl]->setDefaultValue(defaultValue);
   }
   
   - (BOOL)defaultChecked
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_CHECKED).isNull();
  +    return [self _inputElementImpl]->defaultChecked();
   }
   
   - (void)setDefaultChecked:(BOOL)defaultChecked
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_CHECKED, defaultChecked ? "" : 0);
  +    [self _inputElementImpl]->setDefaultChecked(defaultChecked);
   }
   
   - (DOMHTMLFormElement *)form
  @@ -1290,42 +1292,42 @@
   
   - (NSString *)accept
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_ACCEPT);
  +    return [self _inputElementImpl]->accept();
   }
   
   - (void)setAccept:(NSString *)accept
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_ACCEPT, accept);
  +    [self _inputElementImpl]->setAccept(accept);
   }
   
   - (NSString *)accessKey
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_ACCESSKEY);
  +    return [self _inputElementImpl]->accessKey();
   }
   
   - (void)setAccessKey:(NSString *)accessKey
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_ACCESSKEY, accessKey);
  +    [self _inputElementImpl]->setAccessKey(accessKey);
   }
   
   - (NSString *)align
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _inputElementImpl]->align();
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _inputElementImpl]->setAlign(align);
   }
   
   - (NSString *)alt
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_ALT);
  +    return [self _inputElementImpl]->alt();
   }
   
   - (void)setAlt:(NSString *)alt
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_ALT, alt);
  +    [self _inputElementImpl]->setAlt(alt);
   }
   
   - (BOOL)checked
  @@ -1340,23 +1342,22 @@
   
   - (BOOL)disabled
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_DISABLED).isNull();
  +    return [self _inputElementImpl]->disabled();
   }
   
   - (void)setDisabled:(BOOL)disabled
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    [self _inputElementImpl]->setDisabled(disabled);
   }
   
   - (long)maxLength
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_MAXLENGTH).toInt();
  +    return [self _inputElementImpl]->maxLength();
   }
   
   - (void)setMaxLength:(long)maxLength
   {
  -    DOMString value(QString::number(maxLength));
  -    [self _inputElementImpl]->setAttribute(ATTR_MAXLENGTH, value);
  +    [self _inputElementImpl]->setMaxLength(maxLength);
   }
   
   - (NSString *)name
  @@ -1371,22 +1372,22 @@
   
   - (BOOL)readOnly
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_READONLY).isNull();
  +    return [self _inputElementImpl]->readOnly();
   }
   
   - (void)setReadOnly:(BOOL)readOnly
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_READONLY, readOnly ? "" : 0);
  +    [self _inputElementImpl]->setReadOnly(readOnly);
   }
   
  -- (NSString *)size
  +- (unsigned long)size
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_SIZE);
  +    return [self _inputElementImpl]->size();
   }
   
  -- (void)setSize:(NSString *)size
  +- (void)setSize:(unsigned long)size
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_SIZE, size);
  +    [self _inputElementImpl]->setSize(size);
   }
   
   - (NSString *)src
  @@ -1396,7 +1397,7 @@
   
   - (void)setSrc:(NSString *)src
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_SRC, src);
  +    [self _inputElementImpl]->setSrc(src);
   }
   
   - (long)tabIndex
  @@ -1421,12 +1422,12 @@
   
   - (NSString *)useMap
   {
  -    return [self _inputElementImpl]->getAttribute(ATTR_USEMAP);
  +    return [self _inputElementImpl]->useMap();
   }
   
   - (void)setUseMap:(NSString *)useMap
   {
  -    [self _inputElementImpl]->setAttribute(ATTR_USEMAP, useMap);
  +    [self _inputElementImpl]->setUseMap(useMap);
   }
   
   - (NSString *)value
  @@ -1485,33 +1486,33 @@
   
   - (NSString *)accessKey
   {
  -    return [self _textAreaElementImpl]->getAttribute(ATTR_ACCESSKEY);
  +    return [self _textAreaElementImpl]->getAttribute(HTMLAttributes::accesskey());
   }
   
   - (void)setAccessKey:(NSString *)accessKey
   {
  -    [self _textAreaElementImpl]->setAttribute(ATTR_ACCESSKEY, accessKey);
  +    [self _textAreaElementImpl]->setAttribute(HTMLAttributes::accesskey(), accessKey);
   }
   
   - (long)cols
   {
  -    return [self _textAreaElementImpl]->getAttribute(ATTR_COLS).toInt();
  +    return [self _textAreaElementImpl]->getAttribute(HTMLAttributes::cols()).toInt();
   }
   
   - (void)setCols:(long)cols
   {
       DOMString value(QString::number(cols));
  -    [self _textAreaElementImpl]->setAttribute(ATTR_COLS, value);
  +    [self _textAreaElementImpl]->setAttribute(HTMLAttributes::cols(), value);
   }
   
   - (BOOL)disabled
   {
  -    return [self _textAreaElementImpl]->getAttribute(ATTR_DISABLED).isNull();
  +    return [self _textAreaElementImpl]->getAttribute(HTMLAttributes::disabled()).isNull();
   }
   
   - (void)setDisabled:(BOOL)disabled
   {
  -    [self _textAreaElementImpl]->setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    [self _textAreaElementImpl]->setAttribute(HTMLAttributes::disabled(), disabled ? "" : 0);
   }
   
   - (NSString *)name
  @@ -1526,23 +1527,23 @@
   
   - (BOOL)readOnly
   {
  -    return [self _textAreaElementImpl]->getAttribute(ATTR_READONLY).isNull();
  +    return [self _textAreaElementImpl]->getAttribute(HTMLAttributes::readonly()).isNull();
   }
   
   - (void)setReadOnly:(BOOL)readOnly
   {
  -    [self _textAreaElementImpl]->setAttribute(ATTR_READONLY, readOnly ? "" : 0);
  +    [self _textAreaElementImpl]->setAttribute(HTMLAttributes::readonly(), readOnly ? "" : 0);
   }
   
   - (long)rows
   {
  -    return [self _textAreaElementImpl]->getAttribute(ATTR_ROWS).toInt();
  +    return [self _textAreaElementImpl]->getAttribute(HTMLAttributes::rows()).toInt();
   }
   
   - (void)setRows:(long)rows
   {
   	DOMString value(QString::number(rows));
  -    [self _textAreaElementImpl]->setAttribute(ATTR_ROWS, value);
  +    [self _textAreaElementImpl]->setAttribute(HTMLAttributes::rows(), value);
   }
   
   - (long)tabIndex
  @@ -1606,22 +1607,22 @@
   
   - (NSString *)accessKey
   {
  -    return [self _buttonElementImpl]->getAttribute(ATTR_ACCESSKEY);
  +    return [self _buttonElementImpl]->getAttribute(HTMLAttributes::accesskey());
   }
   
   - (void)setAccessKey:(NSString *)accessKey
   {
  -    [self _buttonElementImpl]->setAttribute(ATTR_ACCESSKEY, accessKey);
  +    [self _buttonElementImpl]->setAttribute(HTMLAttributes::accesskey(), accessKey);
   }
   
   - (BOOL)disabled
   {
  -    return [self _buttonElementImpl]->getAttribute(ATTR_DISABLED).isNull();
  +    return [self _buttonElementImpl]->getAttribute(HTMLAttributes::disabled()).isNull();
   }
   
   - (void)setDisabled:(BOOL)disabled
   {
  -    [self _buttonElementImpl]->setAttribute(ATTR_DISABLED, disabled ? "" : 0);
  +    [self _buttonElementImpl]->setAttribute(HTMLAttributes::disabled(), disabled ? "" : 0);
   }
   
   - (NSString *)name
  @@ -1651,12 +1652,12 @@
   
   - (NSString *)value
   {
  -    return [self _buttonElementImpl]->getAttribute(ATTR_VALUE);
  +    return [self _buttonElementImpl]->getAttribute(HTMLAttributes::value());
   }
   
   - (void)setValue:(NSString *)value
   {
  -    [self _buttonElementImpl]->setAttribute(ATTR_VALUE, value);
  +    [self _buttonElementImpl]->setAttribute(HTMLAttributes::value(), value);
   }
   
   @end
  @@ -1678,22 +1679,22 @@
   
   - (NSString *)accessKey
   {
  -    return [self _labelElementImpl]->getAttribute(ATTR_ACCESSKEY);
  +    return [self _labelElementImpl]->getAttribute(HTMLAttributes::accesskey());
   }
   
   - (void)setAccessKey:(NSString *)accessKey
   {
  -    [self _labelElementImpl]->setAttribute(ATTR_ACCESSKEY, accessKey);
  +    [self _labelElementImpl]->setAttribute(HTMLAttributes::accesskey(), accessKey);
   }
   
   - (NSString *)htmlFor
   {
  -    return [self _labelElementImpl]->getAttribute(ATTR_FOR);
  +    return [self _labelElementImpl]->getAttribute(HTMLAttributes::forAttr());
   }
   
   - (void)setHtmlFor:(NSString *)htmlFor
   {
  -    [self _labelElementImpl]->setAttribute(ATTR_FOR, htmlFor);
  +    [self _labelElementImpl]->setAttribute(HTMLAttributes::forAttr(), htmlFor);
   }
   
   @end
  @@ -1726,22 +1727,22 @@
   
   - (NSString *)accessKey
   {
  -    return [self _legendElementImpl]->getAttribute(ATTR_ACCESSKEY);
  +    return [self _legendElementImpl]->getAttribute(HTMLAttributes::accesskey());
   }
   
   - (void)setAccessKey:(NSString *)accessKey
   {
  -    [self _legendElementImpl]->setAttribute(ATTR_ACCESSKEY, accessKey);
  +    [self _legendElementImpl]->setAttribute(HTMLAttributes::accesskey(), accessKey);
   }
   
   - (NSString *)align
   {
  -    return [self _legendElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _legendElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _legendElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _legendElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   @end
  @@ -1755,22 +1756,22 @@
   
   - (BOOL)compact
   {
  -    return [self _uListElementImpl]->getAttribute(ATTR_COMPACT).isNull();
  +    return [self _uListElementImpl]->getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   - (void)setCompact:(BOOL)compact
   {
  -    [self _uListElementImpl]->setAttribute(ATTR_COMPACT, compact ? "" : 0);
  +    [self _uListElementImpl]->setAttribute(HTMLAttributes::compact(), compact ? "" : 0);
   }
   
   - (NSString *)type
   {
  -    return [self _uListElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _uListElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _uListElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _uListElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   @end
  @@ -1784,33 +1785,33 @@
   
   - (BOOL)compact
   {
  -    return [self _oListElementImpl]->getAttribute(ATTR_COMPACT).isNull();
  +    return [self _oListElementImpl]->compact();
   }
   
   - (void)setCompact:(BOOL)compact
   {
  -    [self _oListElementImpl]->setAttribute(ATTR_COMPACT, compact ? "" : 0);
  +    [self _oListElementImpl]->setCompact(compact);
   }
   
   - (long)start
   {
  -    return [self _oListElementImpl]->getAttribute(ATTR_START).toInt();
  +    return [self _oListElementImpl]->getAttribute(HTMLAttributes::start()).toInt();
   }
   
   - (void)setStart:(long)start
   {
   	DOMString value(QString::number(start));
  -    [self _oListElementImpl]->setAttribute(ATTR_START, value);
  +    [self _oListElementImpl]->setAttribute(HTMLAttributes::start(), value);
   }
   
   - (NSString *)type
   {
  -    return [self _oListElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _oListElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _oListElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _oListElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   @end
  @@ -1824,12 +1825,12 @@
   
   - (BOOL)compact
   {
  -    return [self _dListElementImpl]->getAttribute(ATTR_COMPACT).isNull();
  +    return [self _dListElementImpl]->getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   - (void)setCompact:(BOOL)compact
   {
  -    [self _dListElementImpl]->setAttribute(ATTR_COMPACT, compact ? "" : 0);
  +    [self _dListElementImpl]->setAttribute(HTMLAttributes::compact(), compact ? "" : 0);
   }
   
   @end
  @@ -1843,12 +1844,12 @@
   
   - (BOOL)compact
   {
  -    return [self _directoryListElementImpl]->getAttribute(ATTR_COMPACT).isNull();
  +    return [self _directoryListElementImpl]->getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   - (void)setCompact:(BOOL)compact
   {
  -    [self _directoryListElementImpl]->setAttribute(ATTR_COMPACT, compact ? "" : 0);
  +    [self _directoryListElementImpl]->setAttribute(HTMLAttributes::compact(), compact ? "" : 0);
   }
   
   @end
  @@ -1862,12 +1863,12 @@
   
   - (BOOL)compact
   {
  -    return [self _menuListElementImpl]->getAttribute(ATTR_COMPACT).isNull();
  +    return [self _menuListElementImpl]->getAttribute(HTMLAttributes::compact()).isNull();
   }
   
   - (void)setCompact:(BOOL)compact
   {
  -    [self _menuListElementImpl]->setAttribute(ATTR_COMPACT, compact ? "" : 0);
  +    [self _menuListElementImpl]->setAttribute(HTMLAttributes::compact(), compact ? "" : 0);
   }
   
   @end
  @@ -1881,23 +1882,22 @@
   
   - (NSString *)type
   {
  -    return [self _liElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _liElementImpl]->type();
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _liElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _liElementImpl]->setType(type);
   }
   
   - (long)value
   {
  -    return [self _liElementImpl]->getAttribute(ATTR_START).toInt();
  +    return [self _liElementImpl]->value();
   }
   
   - (void)setValue:(long)value
   {
  -	DOMString string(QString::number(value));
  -    [self _liElementImpl]->setAttribute(ATTR_VALUE, string);
  +    [self _liElementImpl]->setValue(value);
   }
   
   @end
  @@ -1911,12 +1911,12 @@
   
   - (NSString *)cite
   {
  -    return [self _quoteElementImpl]->getAttribute(ATTR_CITE);
  +    return [self _quoteElementImpl]->getAttribute(HTMLAttributes::cite());
   }
   
   - (void)setCite:(NSString *)cite
   {
  -    [self _quoteElementImpl]->setAttribute(ATTR_CITE, cite);
  +    [self _quoteElementImpl]->setAttribute(HTMLAttributes::cite(), cite);
   }
   
   @end
  @@ -1930,12 +1930,12 @@
   
   - (NSString *)align
   {
  -    return [self _divElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _divElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _divElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _divElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   @end
  @@ -1949,12 +1949,12 @@
   
   - (NSString *)align
   {
  -    return [self _paragraphElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _paragraphElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _paragraphElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _paragraphElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   @end
  @@ -1968,12 +1968,12 @@
   
   - (NSString *)align
   {
  -    return [self _headingElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _headingElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _headingElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _headingElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   @end
  @@ -1987,13 +1987,13 @@
   
   - (long)width
   {
  -    return [self _preElementImpl]->getAttribute(ATTR_WIDTH).toInt();
  +    return [self _preElementImpl]->getAttribute(HTMLAttributes::width()).toInt();
   }
   
   - (void)setWidth:(long)width
   {
       DOMString string(QString::number(width));
  -    [self _preElementImpl]->setAttribute(ATTR_WIDTH, string);
  +    [self _preElementImpl]->setAttribute(HTMLAttributes::width(), string);
   }
   
   @end
  @@ -2007,12 +2007,12 @@
   
   - (NSString *)clear
   {
  -    return [self _BRElementImpl]->getAttribute(ATTR_CLEAR);
  +    return [self _BRElementImpl]->getAttribute(HTMLAttributes::clear());
   }
   
   - (void)setClear:(NSString *)clear
   {
  -    [self _BRElementImpl]->setAttribute(ATTR_CLEAR, clear);
  +    [self _BRElementImpl]->setAttribute(HTMLAttributes::clear(), clear);
   }
   
   @end
  @@ -2026,32 +2026,32 @@
   
   - (NSString *)color
   {
  -    return [self _baseFontElementImpl]->getAttribute(ATTR_COLOR);
  +    return [self _baseFontElementImpl]->getAttribute(HTMLAttributes::color());
   }
   
   - (void)setColor:(NSString *)color
   {
  -    [self _baseFontElementImpl]->setAttribute(ATTR_COLOR, color);
  +    [self _baseFontElementImpl]->setAttribute(HTMLAttributes::color(), color);
   }
   
   - (NSString *)face
   {
  -    return [self _baseFontElementImpl]->getAttribute(ATTR_FACE);
  +    return [self _baseFontElementImpl]->getAttribute(HTMLAttributes::face());
   }
   
   - (void)setFace:(NSString *)face
   {
  -    [self _baseFontElementImpl]->setAttribute(ATTR_FACE, face);
  +    [self _baseFontElementImpl]->setAttribute(HTMLAttributes::face(), face);
   }
   
   - (NSString *)size
   {
  -    return [self _baseFontElementImpl]->getAttribute(ATTR_SIZE);
  +    return [self _baseFontElementImpl]->getAttribute(HTMLAttributes::size());
   }
   
   - (void)setSize:(NSString *)size
   {
  -    [self _baseFontElementImpl]->setAttribute(ATTR_SIZE, size);
  +    [self _baseFontElementImpl]->setAttribute(HTMLAttributes::size(), size);
   }
   
   @end
  @@ -2065,32 +2065,32 @@
   
   - (NSString *)color
   {
  -    return [self _fontElementImpl]->getAttribute(ATTR_COLOR);
  +    return [self _fontElementImpl]->getAttribute(HTMLAttributes::color());
   }
   
   - (void)setColor:(NSString *)color
   {
  -    [self _fontElementImpl]->setAttribute(ATTR_COLOR, color);
  +    [self _fontElementImpl]->setAttribute(HTMLAttributes::color(), color);
   }
   
   - (NSString *)face
   {
  -    return [self _fontElementImpl]->getAttribute(ATTR_FACE);
  +    return [self _fontElementImpl]->getAttribute(HTMLAttributes::face());
   }
   
   - (void)setFace:(NSString *)face
   {
  -    [self _fontElementImpl]->setAttribute(ATTR_FACE, face);
  +    [self _fontElementImpl]->setAttribute(HTMLAttributes::face(), face);
   }
   
   - (NSString *)size
   {
  -    return [self _fontElementImpl]->getAttribute(ATTR_SIZE);
  +    return [self _fontElementImpl]->getAttribute(HTMLAttributes::size());
   }
   
   - (void)setSize:(NSString *)size
   {
  -    [self _fontElementImpl]->setAttribute(ATTR_SIZE, size);
  +    [self _fontElementImpl]->setAttribute(HTMLAttributes::size(), size);
   }
   
   @end
  @@ -2104,42 +2104,42 @@
   
   - (NSString *)align
   {
  -    return [self _HRElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _HRElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _HRElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _HRElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (BOOL)noShade
   {
  -    return [self _HRElementImpl]->getAttribute(ATTR_NOSHADE).isNull();
  +    return [self _HRElementImpl]->getAttribute(HTMLAttributes::noshade()).isNull();
   }
   
   - (void)setNoShade:(BOOL)noShade
   {
  -    [self _HRElementImpl]->setAttribute(ATTR_CHECKED, noShade ? "" : 0);
  +    [self _HRElementImpl]->setAttribute(HTMLAttributes::noshade(), noShade ? "" : 0);
   }
   
   - (NSString *)size
   {
  -    return [self _HRElementImpl]->getAttribute(ATTR_SIZE);
  +    return [self _HRElementImpl]->getAttribute(HTMLAttributes::size());
   }
   
   - (void)setSize:(NSString *)size
   {
  -    [self _HRElementImpl]->setAttribute(ATTR_SIZE, size);
  +    [self _HRElementImpl]->setAttribute(HTMLAttributes::size(), size);
   }
   
   - (NSString *)width
   {
  -    return [self _HRElementImpl]->getAttribute(ATTR_WIDTH);
  +    return [self _HRElementImpl]->getAttribute(HTMLAttributes::width());
   }
   
   - (void)setWidth:(NSString *)width
   {
  -    [self _HRElementImpl]->setAttribute(ATTR_WIDTH, width);
  +    [self _HRElementImpl]->setAttribute(HTMLAttributes::width(), width);
   }
   
   @end
  @@ -2153,22 +2153,22 @@
   
   - (NSString *)cite
   {
  -    return [self _modElementImpl]->getAttribute(ATTR_CITE);
  +    return [self _modElementImpl]->getAttribute(HTMLAttributes::cite());
   }
   
   - (void)setCite:(NSString *)cite
   {
  -    [self _modElementImpl]->setAttribute(ATTR_CITE, cite);
  +    [self _modElementImpl]->setAttribute(HTMLAttributes::cite(), cite);
   }
   
   - (NSString *)dateTime
   {
  -    return [self _modElementImpl]->getAttribute(ATTR_DATETIME);
  +    return [self _modElementImpl]->getAttribute(HTMLAttributes::datetime());
   }
   
   - (void)setDateTime:(NSString *)dateTime
   {
  -    [self _modElementImpl]->setAttribute(ATTR_DATETIME, dateTime);
  +    [self _modElementImpl]->setAttribute(HTMLAttributes::datetime(), dateTime);
   }
   
   @end
  @@ -2182,32 +2182,32 @@
   
   - (NSString *)accessKey
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_ACCESSKEY);
  +    return [self _anchorElementImpl]->getAttribute(HTMLAttributes::accesskey());
   }
   
   - (void)setAccessKey:(NSString *)accessKey
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_ACCESSKEY, accessKey);
  +    [self _anchorElementImpl]->setAttribute(HTMLAttributes::accesskey(), accessKey);
   }
   
   - (NSString *)charset
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_CHARSET);
  +    return [self _anchorElementImpl]->getAttribute(HTMLAttributes::charset());
   }
   
   - (void)setCharset:(NSString *)charset
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_CHARSET, charset);
  +    [self _anchorElementImpl]->setAttribute(HTMLAttributes::charset(), charset);
   }
   
   - (NSString *)coords
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_COORDS);
  +    return [self _anchorElementImpl]->getAttribute(HTMLAttributes::coords());
   }
   
   - (void)setCoords:(NSString *)coords
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_COORDS, coords);
  +    [self _anchorElementImpl]->setAttribute(HTMLAttributes::coords(), coords);
   }
   
   - (NSString *)href
  @@ -2217,88 +2217,87 @@
   
   - (void)setHref:(NSString *)href
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_HREF, href);
  +    [self _anchorElementImpl]->setAttribute(HTMLAttributes::href(), href);
   }
   
   - (NSString *)hreflang
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_HREFLANG);
  +    return [self _anchorElementImpl]->hreflang();
   }
   
   - (void)setHreflang:(NSString *)hreflang
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_HREFLANG, hreflang);
  +    [self _anchorElementImpl]->setHreflang(hreflang);
   }
   
   - (NSString *)name
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _anchorElementImpl]->name();
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _anchorElementImpl]->setName(name);
   }
   
   - (NSString *)rel
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_REL);
  +    return [self _anchorElementImpl]->rel();
   }
   
   - (void)setRel:(NSString *)rel
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_REL, rel);
  +    [self _anchorElementImpl]->setRel(rel);
   }
   
   - (NSString *)rev
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_REV);
  +    return [self _anchorElementImpl]->rev();
   }
   
   - (void)setRev:(NSString *)rev
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_REV, rev);
  +    [self _anchorElementImpl]->setRev(rev);
   }
   
   - (NSString *)shape
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_SHAPE);
  +    return [self _anchorElementImpl]->shape();
   }
   
   - (void)setShape:(NSString *)shape
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_SHAPE, shape);
  +    [self _anchorElementImpl]->setShape(shape);
   }
   
   - (long)tabIndex
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_TABINDEX).toInt();
  +    return [self _anchorElementImpl]->tabIndex();
   }
   
   - (void)setTabIndex:(long)tabIndex
   {
  -	DOMString string(QString::number(tabIndex));
  -    [self _anchorElementImpl]->setAttribute(ATTR_TABINDEX, string);
  +    [self _anchorElementImpl]->setTabIndex(tabIndex);
   }
   
   - (NSString *)target
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_TARGET);
  +    return [self _anchorElementImpl]->getAttribute(HTMLAttributes::target());
   }
   
   - (void)setTarget:(NSString *)target
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_TARGET, target);
  +    [self _anchorElementImpl]->setAttribute(HTMLAttributes::target(), target);
   }
   
   - (NSString *)type
   {
  -    return [self _anchorElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _anchorElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _anchorElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _anchorElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   - (void)blur
  @@ -2325,84 +2324,84 @@
   
   - (NSString *)name
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _imageElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (NSString *)align
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _imageElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)alt
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_ALT);
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::alt());
   }
   
   - (void)setAlt:(NSString *)alt
   {
  -    [self _imageElementImpl]->setAttribute(ATTR_ALT, alt);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::alt(), alt);
   }
   
   - (NSString *)border
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_BORDER);
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::border());
   }
   
   - (void)setBorder:(NSString *)border
   {
  -    [self _imageElementImpl]->setAttribute(ATTR_BORDER, border);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::border(), border);
   }
   
   - (long)height
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_HEIGHT).toInt();
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::height()).toInt();
   }
   
   - (void)setHeight:(long)height
   {
       DOMString string(QString::number(height));
  -    [self _imageElementImpl]->setAttribute(ATTR_HEIGHT, string);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::height(), string);
   }
   
   - (long)hspace
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_HSPACE).toInt();
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::hspace()).toInt();
   }
   
   - (void)setHspace:(long)hspace
   {
       DOMString string(QString::number(hspace));
  -    [self _imageElementImpl]->setAttribute(ATTR_HSPACE, string);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::hspace(), string);
   }
   
   - (BOOL)isMap
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_ISMAP).isNull();
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::ismap()).isNull();
   }
   
   - (void)setIsMap:(BOOL)isMap
   {
  -    [self _imageElementImpl]->setAttribute(ATTR_ISMAP, isMap ? "" : 0);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::ismap(), isMap ? "" : 0);
   }
   
   - (NSString *)longDesc
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_LONGDESC);
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::longdesc());
   }
   
   - (void)setLongDesc:(NSString *)longDesc
   {
  -    [self _imageElementImpl]->setAttribute(ATTR_LONGDESC, longDesc);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::longdesc(), longDesc);
   }
   
   - (NSString *)src
  @@ -2412,39 +2411,39 @@
   
   - (void)setSrc:(NSString *)src
   {
  -    [self _imageElementImpl]->setAttribute(ATTR_SRC, src);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::src(), src);
   }
   
   - (NSString *)useMap
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_USEMAP);
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::usemap());
   }
   
   - (void)setUseMap:(NSString *)useMap
   {
  -    [self _imageElementImpl]->setAttribute(ATTR_USEMAP, useMap);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::usemap(), useMap);
   }
   
   - (long)vspace
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_VSPACE).toInt();
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::vspace()).toInt();
   }
   
   - (void)setVspace:(long)vspace
   {
       DOMString string(QString::number(vspace));
  -    [self _imageElementImpl]->setAttribute(ATTR_VSPACE, string);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::vspace(), string);
   }
   
   - (long)width
   {
  -    return [self _imageElementImpl]->getAttribute(ATTR_WIDTH).toInt();
  +    return [self _imageElementImpl]->getAttribute(HTMLAttributes::width()).toInt();
   }
   
   - (void)setWidth:(long)width
   {
       DOMString string(QString::number(width));
  -    [self _imageElementImpl]->setAttribute(ATTR_WIDTH, string);
  +    [self _imageElementImpl]->setAttribute(HTMLAttributes::width(), string);
   }
   
   @end
  @@ -2463,175 +2462,175 @@
   
   - (NSString *)code
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_CODE);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::code());
   }
   
   - (void)setCode:(NSString *)code
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_CODE, code);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::code(), code);
   }
   
   - (NSString *)align
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)archive
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_ARCHIVE);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::archive());
   }
   
   - (void)setArchive:(NSString *)archive
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_ARCHIVE, archive);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::archive(), archive);
   }
   
   - (NSString *)border
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_BORDER);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::border());
   }
   
   - (void)setBorder:(NSString *)border
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_BORDER, border);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::border(), border);
   }
   
   - (NSString *)codeBase
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_CODEBASE);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::codebase());
   }
   
   - (void)setCodeBase:(NSString *)codeBase
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_CODEBASE, codeBase);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::codebase(), codeBase);
   }
   
   - (NSString *)codeType
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_CODETYPE);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::codetype());
   }
   
   - (void)setCodeType:(NSString *)codeType
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_CODETYPE, codeType);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::codetype(), codeType);
   }
   
   - (NSString *)data
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_DATA);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::data());
   }
   
   - (void)setData:(NSString *)data
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_DATA, data);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::data(), data);
   }
   
   - (BOOL)declare
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_DECLARE).isNull();
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::declare()).isNull();
   }
   
   - (void)setDeclare:(BOOL)declare
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_DECLARE, declare ? "" : 0);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::declare(), declare ? "" : 0);
   }
   
   - (NSString *)height
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_HEIGHT);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::height());
   }
   
   - (void)setHeight:(NSString *)height
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_HEIGHT, height);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::height(), height);
   }
   
   - (long)hspace
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_HSPACE).toInt();
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::hspace()).toInt();
   }
   
   - (void)setHspace:(long)hspace
   {
       DOMString string(QString::number(hspace));
  -    [self _objectElementImpl]->setAttribute(ATTR_HSPACE, string);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::hspace(), string);
   }
   
   - (NSString *)name
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (NSString *)standby
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_STANDBY);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::standby());
   }
   
   - (void)setStandby:(NSString *)standby
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_STANDBY, standby);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::standby(), standby);
   }
   
   - (long)tabIndex
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_TABINDEX).toInt();
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::tabindex()).toInt();
   }
   
   - (void)setTabIndex:(long)tabIndex
   {
       DOMString string(QString::number(tabIndex));
  -    [self _objectElementImpl]->setAttribute(ATTR_TABINDEX, string);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::tabindex(), string);
   }
   
   - (NSString *)type
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   - (NSString *)useMap
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_USEMAP);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::usemap());
   }
   
   - (void)setUseMap:(NSString *)useMap
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_USEMAP, useMap);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::usemap(), useMap);
   }
   
   - (long)vspace
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_VSPACE).toInt();
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::vspace()).toInt();
   }
   
   - (void)setVspace:(long)vspace
   {
       DOMString string(QString::number(vspace));
  -    [self _objectElementImpl]->setAttribute(ATTR_VSPACE, string);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::vspace(), string);
   }
   
   - (NSString *)width
   {
  -    return [self _objectElementImpl]->getAttribute(ATTR_WIDTH);
  +    return [self _objectElementImpl]->getAttribute(HTMLAttributes::width());
   }
   
   - (void)setWidth:(NSString *)width
   {
  -    [self _objectElementImpl]->setAttribute(ATTR_WIDTH, width);
  +    [self _objectElementImpl]->setAttribute(HTMLAttributes::width(), width);
   }
   
   - (DOMDocument *)contentDocument
  @@ -2650,42 +2649,42 @@
   
   - (NSString *)name
   {
  -    return [self _paramElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _paramElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _paramElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _paramElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (NSString *)type
   {
  -    return [self _paramElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _paramElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _paramElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _paramElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   - (NSString *)value
   {
  -    return [self _paramElementImpl]->getAttribute(ATTR_VALUE);
  +    return [self _paramElementImpl]->getAttribute(HTMLAttributes::value());
   }
   
   - (void)setValue:(NSString *)value
   {
  -    [self _paramElementImpl]->setAttribute(ATTR_VALUE, value);
  +    [self _paramElementImpl]->setAttribute(HTMLAttributes::value(), value);
   }
   
   - (NSString *)valueType
   {
  -    return [self _paramElementImpl]->getAttribute(ATTR_VALUETYPE);
  +    return [self _paramElementImpl]->getAttribute(HTMLAttributes::valuetype());
   }
   
   - (void)setValueType:(NSString *)valueType
   {
  -    [self _paramElementImpl]->setAttribute(ATTR_VALUETYPE, valueType);
  +    [self _paramElementImpl]->setAttribute(HTMLAttributes::valuetype(), valueType);
   }
   
   @end
  @@ -2699,114 +2698,114 @@
   
   - (NSString *)align
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)alt
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_ALT);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::alt());
   }
   
   - (void)setAlt:(NSString *)alt
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_ALT, alt);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::alt(), alt);
   }
   
   - (NSString *)archive
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_ARCHIVE);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::archive());
   }
   
   - (void)setArchive:(NSString *)archive
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_ARCHIVE, archive);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::archive(), archive);
   }
   
   - (NSString *)code
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_CODE);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::code());
   }
   
   - (void)setCode:(NSString *)code
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_CODE, code);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::code(), code);
   }
   
   - (NSString *)codeBase
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_CODEBASE);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::codebase());
   }
   
   - (void)setCodeBase:(NSString *)codeBase
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_CODEBASE, codeBase);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::codebase(), codeBase);
   }
   
   - (NSString *)height
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_HEIGHT);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::height());
   }
   
   - (void)setHeight:(NSString *)height
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_HEIGHT, height);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::height(), height);
   }
   
   - (long)hspace
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_HSPACE).toInt();
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::hspace()).toInt();
   }
   
   - (void)setHspace:(long)hspace
   {
       DOMString string(QString::number(hspace));
  -    [self _appletElementImpl]->setAttribute(ATTR_HSPACE, string);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::hspace(), string);
   }
   
   - (NSString *)name
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (NSString *)object
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_OBJECT);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::object());
   }
   
   - (void)setObject:(NSString *)object
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_OBJECT, object);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::object(), object);
   }
   
   - (long)vspace
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_VSPACE).toInt();
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::vspace()).toInt();
   }
   
   - (void)setVspace:(long)vspace
   {
       DOMString string(QString::number(vspace));
  -    [self _appletElementImpl]->setAttribute(ATTR_VSPACE, string);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::vspace(), string);
   }
   
   - (NSString *)width
   {
  -    return [self _appletElementImpl]->getAttribute(ATTR_WIDTH);
  +    return [self _appletElementImpl]->getAttribute(HTMLAttributes::width());
   }
   
   - (void)setWidth:(NSString *)width
   {
  -    [self _appletElementImpl]->setAttribute(ATTR_WIDTH, width);
  +    [self _appletElementImpl]->setAttribute(HTMLAttributes::width(), width);
   }
   
   @end
  @@ -2826,12 +2825,12 @@
   
   - (NSString *)name
   {
  -    return [self _mapElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _mapElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _mapElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _mapElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   @end
  @@ -2845,32 +2844,32 @@
   
   - (NSString *)accessKey
   {
  -    return [self _areaElementImpl]->getAttribute(ATTR_ACCESSKEY);
  +    return [self _areaElementImpl]->getAttribute(HTMLAttributes::accesskey());
   }
   
   - (void)setAccessKey:(NSString *)accessKey
   {
  -    [self _areaElementImpl]->setAttribute(ATTR_ACCESSKEY, accessKey);
  +    [self _areaElementImpl]->setAttribute(HTMLAttributes::accesskey(), accessKey);
   }
   
   - (NSString *)alt
   {
  -    return [self _areaElementImpl]->getAttribute(ATTR_ALT);
  +    return [self _areaElementImpl]->getAttribute(HTMLAttributes::alt());
   }
   
   - (void)setAlt:(NSString *)alt
   {
  -    [self _areaElementImpl]->setAttribute(ATTR_ALT, alt);
  +    [self _areaElementImpl]->setAttribute(HTMLAttributes::alt(), alt);
   }
   
   - (NSString *)coords
   {
  -    return [self _areaElementImpl]->getAttribute(ATTR_COORDS);
  +    return [self _areaElementImpl]->getAttribute(HTMLAttributes::coords());
   }
   
   - (void)setCoords:(NSString *)coords
   {
  -    [self _areaElementImpl]->setAttribute(ATTR_COORDS, coords);
  +    [self _areaElementImpl]->setAttribute(HTMLAttributes::coords(), coords);
   }
   
   - (NSString *)href
  @@ -2880,48 +2879,48 @@
   
   - (void)setHref:(NSString *)href
   {
  -    [self _areaElementImpl]->setAttribute(ATTR_HREF, href);
  +    [self _areaElementImpl]->setAttribute(HTMLAttributes::href(), href);
   }
   
   - (BOOL)noHref
   {
  -    return [self _areaElementImpl]->getAttribute(ATTR_NOHREF).isNull();
  +    return [self _areaElementImpl]->getAttribute(HTMLAttributes::nohref()).isNull();
   }
   
   - (void)setNoHref:(BOOL)noHref
   {
  -    [self _areaElementImpl]->setAttribute(ATTR_NOHREF, noHref ? "" : 0);
  +    [self _areaElementImpl]->setAttribute(HTMLAttributes::nohref(), noHref ? "" : 0);
   }
   
   - (NSString *)shape
   {
  -    return [self _areaElementImpl]->getAttribute(ATTR_SHAPE);
  +    return [self _areaElementImpl]->getAttribute(HTMLAttributes::shape());
   }
   
   - (void)setShape:(NSString *)shape
   {
  -    [self _areaElementImpl]->setAttribute(ATTR_SHAPE, shape);
  +    [self _areaElementImpl]->setAttribute(HTMLAttributes::shape(), shape);
   }
   
   - (long)tabIndex
   {
  -    return [self _areaElementImpl]->getAttribute(ATTR_TABINDEX).toInt();
  +    return [self _areaElementImpl]->getAttribute(HTMLAttributes::tabindex()).toInt();
   }
   
   - (void)setTabIndex:(long)tabIndex
   {
       DOMString string(QString::number(tabIndex));
  -    [self _areaElementImpl]->setAttribute(ATTR_TABINDEX, string);
  +    [self _areaElementImpl]->setAttribute(HTMLAttributes::tabindex(), string);
   }
   
   - (NSString *)target
   {
  -    return [self _areaElementImpl]->getAttribute(ATTR_TARGET);
  +    return [self _areaElementImpl]->getAttribute(HTMLAttributes::target());
   }
   
   - (void)setTarget:(NSString *)target
   {
  -    [self _areaElementImpl]->setAttribute(ATTR_TARGET, target);
  +    [self _areaElementImpl]->setAttribute(HTMLAttributes::target(), target);
   }
   
   @end
  @@ -2935,12 +2934,12 @@
   
   - (NSString *)text
   {
  -    return [self _scriptElementImpl]->getAttribute(ATTR_TEXT);
  +    return [self _scriptElementImpl]->getAttribute(HTMLAttributes::text());
   }
   
   - (void)setText:(NSString *)text
   {
  -    [self _scriptElementImpl]->setAttribute(ATTR_TEXT, text);
  +    [self _scriptElementImpl]->setAttribute(HTMLAttributes::text(), text);
   }
   
   - (NSString *)htmlFor
  @@ -2967,42 +2966,42 @@
   
   - (NSString *)charset
   {
  -    return [self _scriptElementImpl]->getAttribute(ATTR_CHARSET);
  +    return [self _scriptElementImpl]->getAttribute(HTMLAttributes::charset());
   }
   
   - (void)setCharset:(NSString *)charset
   {
  -    [self _scriptElementImpl]->setAttribute(ATTR_CHARSET, charset);
  +    [self _scriptElementImpl]->setAttribute(HTMLAttributes::charset(), charset);
   }
   
   - (BOOL)defer
   {
  -    return [self _scriptElementImpl]->getAttribute(ATTR_DEFER).isNull();
  +    return [self _scriptElementImpl]->getAttribute(HTMLAttributes::defer()).isNull();
   }
   
   - (void)setDefer:(BOOL)defer
   {
  -    [self _scriptElementImpl]->setAttribute(ATTR_DEFER, defer ? "" : 0);
  +    [self _scriptElementImpl]->setAttribute(HTMLAttributes::defer(), defer ? "" : 0);
   }
   
   - (NSString *)src
   {
  -    return [self _scriptElementImpl]->getAttribute(ATTR_SRC);
  +    return [self _scriptElementImpl]->getAttribute(HTMLAttributes::src());
   }
   
   - (void)setSrc:(NSString *)src
   {
  -    [self _scriptElementImpl]->setAttribute(ATTR_SRC, src);
  +    [self _scriptElementImpl]->setAttribute(HTMLAttributes::src(), src);
   }
   
   - (NSString *)type
   {
  -    return [self _scriptElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _scriptElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _scriptElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _scriptElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   @end
  @@ -3011,12 +3010,12 @@
   
   - (NSString *)align
   {
  -    return [self _tableCaptionElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _tableCaptionElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _tableCaptionElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _tableCaptionElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   @end
  @@ -3039,42 +3038,42 @@
   
   - (NSString *)align
   {
  -    return [self _tableSectionElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _tableSectionElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _tableSectionElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _tableSectionElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)ch
   {
  -    return [self _tableSectionElementImpl]->getAttribute(ATTR_CHAR);
  +    return [self _tableSectionElementImpl]->getAttribute(HTMLAttributes::charoff());
   }
   
   - (void)setCh:(NSString *)ch
   {
  -    [self _tableSectionElementImpl]->setAttribute(ATTR_CHAR, ch);
  +    [self _tableSectionElementImpl]->setAttribute(HTMLAttributes::charoff(), ch);
   }
   
   - (NSString *)chOff
   {
  -    return [self _tableSectionElementImpl]->getAttribute(ATTR_CHAROFF);
  +    return [self _tableSectionElementImpl]->getAttribute(HTMLAttributes::charoff());
   }
   
   - (void)setChOff:(NSString *)chOff
   {
  -    [self _tableSectionElementImpl]->setAttribute(ATTR_CHAROFF, chOff);
  +    [self _tableSectionElementImpl]->setAttribute(HTMLAttributes::charoff(), chOff);
   }
   
   - (NSString *)vAlign
   {
  -    return [self _tableSectionElementImpl]->getAttribute(ATTR_VALIGN);
  +    return [self _tableSectionElementImpl]->getAttribute(HTMLAttributes::valign());
   }
   
   - (void)setVAlign:(NSString *)vAlign
   {
  -    [self _tableSectionElementImpl]->setAttribute(ATTR_VALIGN, vAlign);
  +    [self _tableSectionElementImpl]->setAttribute(HTMLAttributes::valign(), vAlign);
   }
   
   - (DOMHTMLCollection *)rows
  @@ -3160,92 +3159,92 @@
   
   - (NSString *)align
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)bgColor
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_BGCOLOR);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::bgcolor());
   }
   
   - (void)setBgColor:(NSString *)bgColor
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_BGCOLOR, bgColor);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::bgcolor(), bgColor);
   }
   
   - (NSString *)border
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_BORDER);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::border());
   }
   
   - (void)setBorder:(NSString *)border
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_BORDER, border);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::border(), border);
   }
   
   - (NSString *)cellPadding
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_CELLPADDING);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::cellpadding());
   }
   
   - (void)setCellPadding:(NSString *)cellPadding
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_CELLPADDING, cellPadding);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::cellpadding(), cellPadding);
   }
   
   - (NSString *)cellSpacing
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_CELLSPACING);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::cellspacing());
   }
   
   - (void)setCellSpacing:(NSString *)cellSpacing
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_CELLSPACING, cellSpacing);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::cellspacing(), cellSpacing);
   }
   
   - (NSString *)frameBorders
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_FRAME);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::frame());
   }
   
   - (void)setFrameBorders:(NSString *)frameBorders
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_FRAME, frameBorders);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::frame(), frameBorders);
   }
   
   - (NSString *)rules
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_RULES);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::rules());
   }
   
   - (void)setRules:(NSString *)rules
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_RULES, rules);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::rules(), rules);
   }
   
   - (NSString *)summary
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_SUMMARY);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::summary());
   }
   
   - (void)setSummary:(NSString *)summary
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_SUMMARY, summary);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::summary(), summary);
   }
   
   - (NSString *)width
   {
  -    return [self _tableElementImpl]->getAttribute(ATTR_WIDTH);
  +    return [self _tableElementImpl]->getAttribute(HTMLAttributes::width());
   }
   
   - (void)setWidth:(NSString *)width
   {
  -    [self _tableElementImpl]->setAttribute(ATTR_WIDTH, width);
  +    [self _tableElementImpl]->setAttribute(HTMLAttributes::width(), width);
   }
   
   - (DOMHTMLElement *)createTHead
  @@ -3321,63 +3320,63 @@
   
   - (NSString *)align
   {
  -    return [self _tableColElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _tableColElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _tableColElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _tableColElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)ch
   {
  -    return [self _tableColElementImpl]->getAttribute(ATTR_CHAR);
  +    return [self _tableColElementImpl]->getAttribute(HTMLAttributes::charoff());
   }
   
   - (void)setCh:(NSString *)ch
   {
  -    [self _tableColElementImpl]->setAttribute(ATTR_CHAR, ch);
  +    [self _tableColElementImpl]->setAttribute(HTMLAttributes::charoff(), ch);
   }
   
   - (NSString *)chOff
   {
  -    return [self _tableColElementImpl]->getAttribute(ATTR_CHAROFF);
  +    return [self _tableColElementImpl]->getAttribute(HTMLAttributes::charoff());
   }
   
   - (void)setChOff:(NSString *)chOff
   {
  -    [self _tableColElementImpl]->setAttribute(ATTR_CHAROFF, chOff);
  +    [self _tableColElementImpl]->setAttribute(HTMLAttributes::charoff(), chOff);
   }
   
   - (long)span
   {
  -    return [self _tableColElementImpl]->getAttribute(ATTR_SPAN).toInt();
  +    return [self _tableColElementImpl]->getAttribute(HTMLAttributes::span()).toInt();
   }
   
   - (void)setSpan:(long)span
   {
       DOMString string(QString::number(span));
  -    [self _tableColElementImpl]->setAttribute(ATTR_SPAN, string);
  +    [self _tableColElementImpl]->setAttribute(HTMLAttributes::span(), string);
   }
   
   - (NSString *)vAlign
   {
  -    return [self _tableColElementImpl]->getAttribute(ATTR_VALIGN);
  +    return [self _tableColElementImpl]->getAttribute(HTMLAttributes::valign());
   }
   
   - (void)setVAlign:(NSString *)vAlign
   {
  -    [self _tableColElementImpl]->setAttribute(ATTR_VALIGN, vAlign);
  +    [self _tableColElementImpl]->setAttribute(HTMLAttributes::valign(), vAlign);
   }
   
   - (NSString *)width
   {
  -    return [self _tableColElementImpl]->getAttribute(ATTR_WIDTH);
  +    return [self _tableColElementImpl]->getAttribute(HTMLAttributes::width());
   }
   
   - (void)setWidth:(NSString *)width
   {
  -    [self _tableColElementImpl]->setAttribute(ATTR_WIDTH, width);
  +    [self _tableColElementImpl]->setAttribute(HTMLAttributes::width(), width);
   }
   
   @end
  @@ -3407,52 +3406,52 @@
   
   - (NSString *)align
   {
  -    return [self _tableRowElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _tableRowElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _tableRowElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _tableRowElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)bgColor
   {
  -    return [self _tableRowElementImpl]->getAttribute(ATTR_BGCOLOR);
  +    return [self _tableRowElementImpl]->getAttribute(HTMLAttributes::bgcolor());
   }
   
   - (void)setBgColor:(NSString *)bgColor
   {
  -    [self _tableRowElementImpl]->setAttribute(ATTR_BGCOLOR, bgColor);
  +    [self _tableRowElementImpl]->setAttribute(HTMLAttributes::bgcolor(), bgColor);
   }
   
   - (NSString *)ch
   {
  -    return [self _tableRowElementImpl]->getAttribute(ATTR_CHAR);
  +    return [self _tableRowElementImpl]->getAttribute(HTMLAttributes::charoff());
   }
   
   - (void)setCh:(NSString *)ch
   {
  -    [self _tableRowElementImpl]->setAttribute(ATTR_CHAR, ch);
  +    [self _tableRowElementImpl]->setAttribute(HTMLAttributes::charoff(), ch);
   }
   
   - (NSString *)chOff
   {
  -    return [self _tableRowElementImpl]->getAttribute(ATTR_CHAROFF);
  +    return [self _tableRowElementImpl]->getAttribute(HTMLAttributes::charoff());
   }
   
   - (void)setChOff:(NSString *)chOff
   {
  -    [self _tableRowElementImpl]->setAttribute(ATTR_CHAROFF, chOff);
  +    [self _tableRowElementImpl]->setAttribute(HTMLAttributes::charoff(), chOff);
   }
   
   - (NSString *)vAlign
   {
  -    return [self _tableRowElementImpl]->getAttribute(ATTR_VALIGN);
  +    return [self _tableRowElementImpl]->getAttribute(HTMLAttributes::valign());
   }
   
   - (void)setVAlign:(NSString *)vAlign
   {
  -    [self _tableRowElementImpl]->setAttribute(ATTR_VALIGN, vAlign);
  +    [self _tableRowElementImpl]->setAttribute(HTMLAttributes::valign(), vAlign);
   }
   
   - (DOMHTMLElement *)insertCell:(long)index
  @@ -3481,144 +3480,144 @@
   
   - (NSString *)abbr
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_ABBR);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::abbr());
   }
   
   - (void)setAbbr:(NSString *)abbr
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_ABBR, abbr);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::abbr(), abbr);
   }
   
   - (NSString *)align
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)axis
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_AXIS);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::axis());
   }
   
   - (void)setAxis:(NSString *)axis
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_AXIS, axis);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::axis(), axis);
   }
   
   - (NSString *)bgColor
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_BGCOLOR);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::bgcolor());
   }
   
   - (void)setBgColor:(NSString *)bgColor
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_BGCOLOR, bgColor);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::bgcolor(), bgColor);
   }
   
   - (NSString *)ch
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_CHAR);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::charoff());
   }
   
   - (void)setCh:(NSString *)ch
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_CHAR, ch);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::charoff(), ch);
   }
   
   - (NSString *)chOff
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_CHAROFF);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::charoff());
   }
   
   - (void)setChOff:(NSString *)chOff
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_CHAROFF, chOff);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::charoff(), chOff);
   }
   
   - (long)colSpan
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_COLSPAN).toInt();
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::colspan()).toInt();
   }
   
   - (void)setColSpan:(long)colSpan
   {
       DOMString string(QString::number(colSpan));
  -    [self _tableCellElementImpl]->setAttribute(ATTR_COLSPAN, string);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::colspan(), string);
   }
   
   - (NSString *)headers
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_HEADERS);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::headers());
   }
   
   - (void)setHeaders:(NSString *)headers
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_HEADERS, headers);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::headers(), headers);
   }
   
   - (NSString *)height
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_HEIGHT);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::height());
   }
   
   - (void)setHeight:(NSString *)height
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_HEIGHT, height);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::height(), height);
   }
   
   - (BOOL)noWrap
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_NOWRAP).isNull();
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::nowrap()).isNull();
   }
   
   - (void)setNoWrap:(BOOL)noWrap
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_NOWRAP, noWrap ? "" : 0);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::nowrap(), noWrap ? "" : 0);
   }
   
   - (long)rowSpan
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_ROWSPAN).toInt();
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::rowspan()).toInt();
   }
   
   - (void)setRowSpan:(long)rowSpan
   {
       DOMString string(QString::number(rowSpan));
  -    [self _tableCellElementImpl]->setAttribute(ATTR_ROWSPAN, string);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::rowspan(), string);
   }
   
   - (NSString *)scope
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_SCOPE);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::scope());
   }
   
   - (void)setScope:(NSString *)scope
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_SCOPE, scope);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::scope(), scope);
   }
   
   - (NSString *)vAlign
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_VALIGN);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::valign());
   }
   
   - (void)setVAlign:(NSString *)vAlign
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_VALIGN, vAlign);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::valign(), vAlign);
   }
   
   - (NSString *)width
   {
  -    return [self _tableCellElementImpl]->getAttribute(ATTR_WIDTH);
  +    return [self _tableCellElementImpl]->getAttribute(HTMLAttributes::width());
   }
   
   - (void)setWidth:(NSString *)width
   {
  -    [self _tableCellElementImpl]->setAttribute(ATTR_WIDTH, width);
  +    [self _tableCellElementImpl]->setAttribute(HTMLAttributes::width(), width);
   }
   
   @end
  @@ -3646,22 +3645,22 @@
   
   - (NSString *)rows
   {
  -    return [self _frameSetElementImpl]->getAttribute(ATTR_ROWS);
  +    return [self _frameSetElementImpl]->getAttribute(HTMLAttributes::rows());
   }
   
   - (void)setRows:(NSString *)rows
   {
  -    [self _frameSetElementImpl]->setAttribute(ATTR_ROWS, rows);
  +    [self _frameSetElementImpl]->setAttribute(HTMLAttributes::rows(), rows);
   }
   
   - (NSString *)cols
   {
  -    return [self _frameSetElementImpl]->getAttribute(ATTR_COLS);
  +    return [self _frameSetElementImpl]->getAttribute(HTMLAttributes::cols());
   }
   
   - (void)setCols:(NSString *)cols
   {
  -    [self _frameSetElementImpl]->setAttribute(ATTR_COLS, cols);
  +    [self _frameSetElementImpl]->setAttribute(HTMLAttributes::cols(), cols);
   }
   
   @end
  @@ -3675,82 +3674,82 @@
   
   - (NSString *)frameBorder
   {
  -    return [self _frameElementImpl]->getAttribute(ATTR_FRAMEBORDER);
  +    return [self _frameElementImpl]->getAttribute(HTMLAttributes::frameborder());
   }
   
   - (void)setFrameBorder:(NSString *)frameBorder
   {
  -    [self _frameElementImpl]->setAttribute(ATTR_FRAMEBORDER, frameBorder);
  +    [self _frameElementImpl]->setAttribute(HTMLAttributes::frameborder(), frameBorder);
   }
   
   - (NSString *)longDesc
   {
  -    return [self _frameElementImpl]->getAttribute(ATTR_LONGDESC);
  +    return [self _frameElementImpl]->getAttribute(HTMLAttributes::longdesc());
   }
   
   - (void)setLongDesc:(NSString *)longDesc
   {
  -    [self _frameElementImpl]->setAttribute(ATTR_LONGDESC, longDesc);
  +    [self _frameElementImpl]->setAttribute(HTMLAttributes::longdesc(), longDesc);
   }
   
   - (NSString *)marginHeight
   {
  -    return [self _frameElementImpl]->getAttribute(ATTR_MARGINHEIGHT);
  +    return [self _frameElementImpl]->getAttribute(HTMLAttributes::marginheight());
   }
   
   - (void)setMarginHeight:(NSString *)marginHeight
   {
  -    [self _frameElementImpl]->setAttribute(ATTR_MARGINHEIGHT, marginHeight);
  +    [self _frameElementImpl]->setAttribute(HTMLAttributes::marginheight(), marginHeight);
   }
   
   - (NSString *)marginWidth
   {
  -    return [self _frameElementImpl]->getAttribute(ATTR_MARGINWIDTH);
  +    return [self _frameElementImpl]->getAttribute(HTMLAttributes::marginwidth());
   }
   
   - (void)setMarginWidth:(NSString *)marginWidth
   {
  -    [self _frameElementImpl]->setAttribute(ATTR_MARGINWIDTH, marginWidth);
  +    [self _frameElementImpl]->setAttribute(HTMLAttributes::marginwidth(), marginWidth);
   }
   
   - (NSString *)name
   {
  -    return [self _frameElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _frameElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _frameElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _frameElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (BOOL)noResize
   {
  -    return [self _frameElementImpl]->getAttribute(ATTR_NORESIZE).isNull();
  +    return [self _frameElementImpl]->getAttribute(HTMLAttributes::noresize()).isNull();
   }
   
   - (void)setNoResize:(BOOL)noResize
   {
  -    [self _frameElementImpl]->setAttribute(ATTR_NORESIZE, noResize ? "" : 0);
  +    [self _frameElementImpl]->setAttribute(HTMLAttributes::noresize(), noResize ? "" : 0);
   }
   
   - (NSString *)scrolling
   {
  -    return [self _frameElementImpl]->getAttribute(ATTR_SCROLLING);
  +    return [self _frameElementImpl]->getAttribute(HTMLAttributes::scrolling());
   }
   
   - (void)setScrolling:(NSString *)scrolling
   {
  -    [self _frameElementImpl]->setAttribute(ATTR_SCROLLING, scrolling);
  +    [self _frameElementImpl]->setAttribute(HTMLAttributes::scrolling(), scrolling);
   }
   
   - (NSString *)src
   {
  -    return [self _frameElementImpl]->getAttribute(ATTR_SRC);
  +    return [self _frameElementImpl]->getAttribute(HTMLAttributes::src());
   }
   
   - (void)setSrc:(NSString *)src
   {
  -    [self _frameElementImpl]->setAttribute(ATTR_SRC, src);
  +    [self _frameElementImpl]->setAttribute(HTMLAttributes::src(), src);
   }
   
   - (DOMDocument *)contentDocument
  @@ -3769,112 +3768,112 @@
   
   - (NSString *)align
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (NSString *)frameBorder
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_FRAMEBORDER);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::frameborder());
   }
   
   - (void)setFrameBorder:(NSString *)frameBorder
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_FRAMEBORDER, frameBorder);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::frameborder(), frameBorder);
   }
   
   - (NSString *)height
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_HEIGHT);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::height());
   }
   
   - (void)setHeight:(NSString *)height
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_HEIGHT, height);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::height(), height);
   }
   
   - (NSString *)longDesc
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_LONGDESC);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::longdesc());
   }
   
   - (void)setLongDesc:(NSString *)longDesc
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_LONGDESC, longDesc);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::longdesc(), longDesc);
   }
   
   - (NSString *)marginHeight
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_MARGINHEIGHT);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::marginheight());
   }
   
   - (void)setMarginHeight:(NSString *)marginHeight
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_MARGINHEIGHT, marginHeight);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::marginheight(), marginHeight);
   }
   
   - (NSString *)marginWidth
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_MARGINWIDTH);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::marginwidth());
   }
   
   - (void)setMarginWidth:(NSString *)marginWidth
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_MARGINWIDTH, marginWidth);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::marginwidth(), marginWidth);
   }
   
   - (NSString *)name
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (BOOL)noResize
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_NORESIZE).isNull();
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::noresize()).isNull();
   }
   
   - (void)setNoResize:(BOOL)noResize
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_NORESIZE, noResize ? "" : 0);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::noresize(), noResize ? "" : 0);
   }
   
   - (NSString *)scrolling
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_SCROLLING);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::scrolling());
   }
   
   - (void)setScrolling:(NSString *)scrolling
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_SCROLLING, scrolling);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::scrolling(), scrolling);
   }
   
   - (NSString *)src
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_SRC);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::src());
   }
   
   - (void)setSrc:(NSString *)src
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_SRC, src);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::src(), src);
   }
   
   - (NSString *)width
   {
  -    return [self _IFrameElementImpl]->getAttribute(ATTR_WIDTH);
  +    return [self _IFrameElementImpl]->getAttribute(HTMLAttributes::width());
   }
   
   - (void)setWidth:(NSString *)width
   {
  -    [self _IFrameElementImpl]->setAttribute(ATTR_WIDTH, width);
  +    [self _IFrameElementImpl]->setAttribute(HTMLAttributes::width(), width);
   }
   
   - (DOMDocument *)contentDocument
  @@ -3895,64 +3894,64 @@
   
   - (NSString *)align
   {
  -    return [self _embedElementImpl]->getAttribute(ATTR_ALIGN);
  +    return [self _embedElementImpl]->getAttribute(HTMLAttributes::align());
   }
   
   - (void)setAlign:(NSString *)align
   {
  -    [self _embedElementImpl]->setAttribute(ATTR_ALIGN, align);
  +    [self _embedElementImpl]->setAttribute(HTMLAttributes::align(), align);
   }
   
   - (long)height
   {
  -    return [self _embedElementImpl]->getAttribute(ATTR_HEIGHT).toInt();
  +    return [self _embedElementImpl]->getAttribute(HTMLAttributes::height()).toInt();
   }
   
   - (void)setHeight:(long)height
   {
       DOMString string(QString::number(height));
  -    [self _embedElementImpl]->setAttribute(ATTR_HEIGHT, string);
  +    [self _embedElementImpl]->setAttribute(HTMLAttributes::height(), string);
   }
   
   - (NSString *)name
   {
  -    return [self _embedElementImpl]->getAttribute(ATTR_NAME);
  +    return [self _embedElementImpl]->getAttribute(HTMLAttributes::name());
   }
   
   - (void)setName:(NSString *)name
   {
  -    [self _embedElementImpl]->setAttribute(ATTR_NAME, name);
  +    [self _embedElementImpl]->setAttribute(HTMLAttributes::name(), name);
   }
   
   - (NSString *)src
   {
  -    return [self _embedElementImpl]->getAttribute(ATTR_SRC);
  +    return [self _embedElementImpl]->getAttribute(HTMLAttributes::src());
   }
   
   - (void)setSrc:(NSString *)src
   {
  -    [self _embedElementImpl]->setAttribute(ATTR_SRC, src);
  +    [self _embedElementImpl]->setAttribute(HTMLAttributes::src(), src);
   }
   
   - (NSString *)type
   {
  -    return [self _embedElementImpl]->getAttribute(ATTR_TYPE);
  +    return [self _embedElementImpl]->getAttribute(HTMLAttributes::type());
   }
   
   - (void)setType:(NSString *)type
   {
  -    [self _embedElementImpl]->setAttribute(ATTR_TYPE, type);
  +    [self _embedElementImpl]->setAttribute(HTMLAttributes::type(), type);
   }
   
   - (long)width
   {
  -    return [self _embedElementImpl]->getAttribute(ATTR_WIDTH).toInt();
  +    return [self _embedElementImpl]->getAttribute(HTMLAttributes::width()).toInt();
   }
   
   - (void)setWidth:(long)width
   {
       DOMString string(QString::number(width));
  -    [self _embedElementImpl]->setAttribute(ATTR_WIDTH, string);
  +    [self _embedElementImpl]->setAttribute(HTMLAttributes::width(), string);
   }
   
   @end
  
  
  
  1.71      +7 -7      WebCore/kwq/KWQAccObject.mm
  
  Index: KWQAccObject.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQAccObject.mm,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- KWQAccObject.mm	9 Jul 2005 20:19:25 -0000	1.70
  +++ KWQAccObject.mm	18 Jul 2005 21:44:31 -0000	1.71
  @@ -47,7 +47,6 @@
   #import "dom_string.h"
   #import "dom2_eventsimpl.h"
   #import "dom2_range.h"
  -#import "htmlattrs.h"
   #import "khtmlview.h"
   #import "khtml_part.h"
   #import "render_canvas.h"
  @@ -71,6 +70,7 @@
   using DOM::ElementImpl;
   using DOM::HTMLAnchorElementImpl;
   using DOM::HTMLAreaElementImpl;
  +using DOM::HTMLAttributes;
   using DOM::HTMLCollection;
   using DOM::HTMLCollectionImpl;
   using DOM::HTMLElementImpl;
  @@ -447,20 +447,20 @@
           return nil;
   
       if (m_areaElement) {
  -        QString summary = static_cast<ElementImpl*>(m_areaElement)->getAttribute(ATTR_SUMMARY).string();
  +        QString summary = static_cast<ElementImpl*>(m_areaElement)->getAttribute(HTMLAttributes::summary()).string();
           if (!summary.isEmpty())
               return summary.getNSString();
  -        QString title = static_cast<ElementImpl*>(m_areaElement)->getAttribute(ATTR_TITLE).string();
  +        QString title = static_cast<ElementImpl*>(m_areaElement)->getAttribute(HTMLAttributes::title()).string();
           if (!title.isEmpty())
               return title.getNSString();
       }
   
       for (RenderObject* curr = m_renderer; curr; curr = curr->parent()) {
           if (curr->element() && curr->element()->isHTMLElement()) {
  -            QString summary = static_cast<ElementImpl*>(curr->element())->getAttribute(ATTR_SUMMARY).string();
  +            QString summary = static_cast<ElementImpl*>(curr->element())->getAttribute(HTMLAttributes::summary()).string();
               if (!summary.isEmpty())
                   return summary.getNSString();
  -            QString title = static_cast<ElementImpl*>(curr->element())->getAttribute(ATTR_TITLE).string();
  +            QString title = static_cast<ElementImpl*>(curr->element())->getAttribute(HTMLAttributes::title()).string();
               if (!title.isEmpty())
                   return title.getNSString();
           }
  @@ -549,7 +549,7 @@
       
       if (m_renderer->isImage()) {
           if (m_renderer->element() && m_renderer->element()->isHTMLElement()) {
  -            QString alt = static_cast<ElementImpl*>(m_renderer->element())->getAttribute(ATTR_ALT).string();
  +            QString alt = static_cast<ElementImpl*>(m_renderer->element())->getAttribute(HTMLAttributes::alt()).string();
               return !alt.isEmpty() ? alt.getNSString() : nil;
           }
       } else if ([self isAttachment])
  @@ -872,7 +872,7 @@
           (m_areaElement || (!m_renderer->isImage() && m_renderer->element() && m_renderer->element()->isLink()))) {
           HTMLAnchorElementImpl* anchor = [self anchorElement];
           if (anchor) {
  -            QString s = anchor->getAttribute(ATTR_HREF).string();
  +            QString s = anchor->getAttribute(HTMLAttributes::href()).string();
               if (!s.isNull()) {
                   s = anchor->getDocument()->completeURL(s);
                   return s.getNSString();
  
  
  
  1.650     +5 -6      WebCore/kwq/KWQKHTMLPart.mm
  
  Index: KWQKHTMLPart.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
  retrieving revision 1.649
  retrieving revision 1.650
  diff -u -r1.649 -r1.650
  --- KWQKHTMLPart.mm	14 Jul 2005 19:06:28 -0000	1.649
  +++ KWQKHTMLPart.mm	18 Jul 2005 21:44:31 -0000	1.650
  @@ -57,8 +57,6 @@
   #import "html_documentimpl.h"
   #import "html_formimpl.h"
   #import "html_tableimpl.h"
  -#import "htmlattrs.h"
  -#import "htmltokenizer.h"
   #import "khtmlpart_p.h"
   #import "khtmlview.h"
   #import "kjs_binding.h"
  @@ -95,6 +93,7 @@
   using DOM::DOMString;
   using DOM::ElementImpl;
   using DOM::EventImpl;
  +using DOM::HTMLAttributes;
   using DOM::HTMLDocumentImpl;
   using DOM::HTMLElementImpl;
   using DOM::HTMLFormElementImpl;
  @@ -572,7 +571,7 @@
   
   NSString *KWQKHTMLPart::matchLabelsAgainstElement(NSArray *labels, ElementImpl *element)
   {
  -    QString name = element->getAttribute(ATTR_NAME).string();
  +    QString name = element->getAttribute(HTMLAttributes::name()).string();
       // Make numbers and _'s in field names behave like word boundaries, e.g., "address2"
       name.replace(QRegExp("[[:digit:]]"), " ");
       name.replace('_', ' ');
  @@ -2839,7 +2838,7 @@
       
       NSFileWrapper *wrapper = nil;
   
  -    AtomicString attr = e->getAttribute(ATTR_SRC);
  +    AtomicString attr = e->getAttribute(HTMLAttributes::src());
       if (!attr.isEmpty()) {
           NSURL *URL = completeURL(attr.string()).getNSURL();
           wrapper = [_bridge fileWrapperForURL:URL];
  @@ -3177,7 +3176,7 @@
                   // for the range of the link.  Note that we create the attributed string from the DOM, which
                   // will have corrected any illegally nested <a> elements.
                   if (linkStartNode && n == linkStartNode) {
  -                    DOMString href = parseURL(linkStartNode->getAttribute(ATTR_HREF));
  +                    DOMString href = parseURL(linkStartNode->getAttribute(HTMLAttributes::href()));
                       KURL kURL = KWQ(linkStartNode->getDocument()->part())->completeURL(href.string());
                       
                       NSURL *URL = kURL.getNSURL();
  @@ -3463,7 +3462,7 @@
   
       styleElement->ref();
   
  -    styleElement->setAttribute(ATTR_STYLE, d->m_typingStyle->cssText().implementation(), exceptionCode);
  +    styleElement->setAttribute(HTMLAttributes::style(), d->m_typingStyle->cssText().implementation(), exceptionCode);
       ASSERT(exceptionCode == 0);
       
       TextImpl *text = xmlDocImpl()->createEditingTextNode("");
  
  
  
  1.402     +7 -7      WebCore/kwq/WebCoreBridge.mm
  
  Index: WebCoreBridge.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
  retrieving revision 1.401
  retrieving revision 1.402
  diff -u -r1.401 -r1.402
  --- WebCoreBridge.mm	14 Jul 2005 16:29:09 -0000	1.401
  +++ WebCoreBridge.mm	18 Jul 2005 21:44:31 -0000	1.402
  @@ -37,7 +37,6 @@
   #import "html_documentimpl.h"
   #import "html_formimpl.h"
   #import "html_imageimpl.h"
  -#import "htmlattrs.h"
   #import "htmlediting.h"
   #import "khtml_part.h"
   #import "khtmlview.h"
  @@ -99,6 +98,7 @@
   using DOM::HTMLImageElementImpl;
   using DOM::HTMLInputElementImpl;
   using DOM::HTMLNames;
  +using DOM::HTMLAttributes;
   using DOM::NodeImpl;
   using DOM::Position;
   using DOM::RangeImpl;
  @@ -1030,7 +1030,7 @@
       // For <area> tags in image maps, walk the tree for the <area>, not the <img> using it.
       for (NodeImpl *titleNode = nodeInfo.innerNode(); titleNode; titleNode = titleNode->parentNode()) {
           if (titleNode->isElementNode()) {
  -            const AtomicString& title = static_cast<ElementImpl *>(titleNode)->getAttribute(ATTR_TITLE);
  +            const AtomicString& title = static_cast<ElementImpl *>(titleNode)->getAttribute(HTMLAttributes::title());
               if (!title.isNull()) {
                   // We found a node with a title.
                   QString titleText = title.string();
  @@ -1047,14 +1047,14 @@
           DocumentImpl *doc = e->getDocument();
           ASSERT(doc);
           
  -        const AtomicString& title = e->getAttribute(ATTR_TITLE);
  +        const AtomicString& title = e->getAttribute(HTMLAttributes::title());
           if (!title.isEmpty()) {
               QString titleText = title.string();
               titleText.replace(QChar('\\'), _part->backslashAsCurrencySymbol());
               [element setObject:titleText.getNSString() forKey:WebCoreElementLinkTitleKey];
           }
           
  -        const AtomicString& link = e->getAttribute(ATTR_HREF);
  +        const AtomicString& link = e->getAttribute(HTMLAttributes::href());
           if (!link.isNull()) {
               QString t = plainText(rangeOfContents(e).get());
               if (!t.isEmpty()) {
  @@ -1064,7 +1064,7 @@
               [element setObject:doc->completeURL(URLString).getNSString() forKey:WebCoreElementLinkURLKey];
           }
           
  -        DOMString target = e->getAttribute(ATTR_TARGET);
  +        DOMString target = e->getAttribute(HTMLAttributes::target());
           if (target.isEmpty() && doc) { // FIXME: Take out this doc check when we're not just before a release.
               target = doc->baseTarget();
           }
  @@ -1096,9 +1096,9 @@
               // FIXME: Code copied from RenderImage::updateFromElement; should share.
               DOMString attr;
               if (i->hasTagName(HTMLNames::object())) {
  -                attr = i->getAttribute(ATTR_DATA);
  +                attr = i->getAttribute(HTMLAttributes::data());
               } else {
  -                attr = i->getAttribute(ATTR_SRC);
  +                attr = i->getAttribute(HTMLAttributes::src());
               }
               if (!attr.isEmpty()) {
                   QString URLString = parseURL(attr).string();
  
  
  



More information about the webkit-changes mailing list