[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml/xml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2009-04-25 1:16:51
Message-ID: 1240622211.116842.22810.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 958921 by orlovich:

automatically merged revision 958920:
Parse doctypes here, too... Fixes 14 failures on newer domts version.

Really, XML tokenizer cleanup may be a nice project for someone who knows a lot about \
XML  and wants to learn KHTML stuff..

 M  +18 -0     xml_tokenizer.cpp  
 M  +2 -0      xml_tokenizer.h  


--- trunk/KDE/kdelibs/khtml/xml/xml_tokenizer.cpp #958920:958921
@@ -408,7 +408,25 @@
     return true;
 }
 
+bool XMLHandler::startDTD(const QString& name, const QString& publicId, const \
QString& systemId) +{
+    int exceptionCode = 0;
+    SharedPtr<DocumentTypeImpl> docType = \
m_doc->implementation()->createDocumentType(name, publicId, systemId, exceptionCode); \
+     +    if (exceptionCode == 0) {
+        docType->setDocument(m_doc);
+        m_doc->appendChild(docType.get(), exceptionCode);
+    }
 
+    return (exceptionCode == 0);
+}
+
+bool XMLHandler::endDTD()
+{
+    return true;
+}
+
+
 //------------------------------------------------------------------------------
 
 XMLTokenizer::XMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view)
--- trunk/KDE/kdelibs/khtml/xml/xml_tokenizer.h #958920:958921
@@ -66,6 +66,8 @@
     bool characters(const QString& ch);
     bool comment(const QString & ch);
     bool processingInstruction(const QString &target, const QString &data);
+    bool startDTD(const QString& name, const QString& publicId, const QString& \
systemId); +    bool endDTD();
     
     // namespace handling, to workaround problem in QXML where some attributes
     // do not get the namespace resolved properly


[prev in list] [next in list] [prev in thread] [next in thread]