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

List:       kde-commits
Subject:    koffice/kformula
From:       Stefan Nikolaus <nikolaus4 () googlemail ! com>
Date:       2007-07-26 15:24:22
Message-ID: 1185463462.582125.3467.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 692917 by nikolaus:

Adapt to the KoXml* classes.


 M  +3 -3      KFormulaPartDocument.cpp  
 M  +0 -1      KFormulaPartDocument.h  
 M  +3 -3      flake/UnderOverElement.cpp  
 M  +1 -1      flake/tests/TestLayout.cpp  
 M  +1 -1      flake/tests/TestLoad.cpp  
 M  +1 -1      flake/tests/TestLoadAndSave.cpp  


--- trunk/koffice/kformula/KFormulaPartDocument.cpp #692916:692917
@@ -85,8 +85,8 @@
     return true;
 }
 
-bool KFormulaPartDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&,
-                                      const QDomDocument&, KoStore* )
+bool KFormulaPartDocument::loadOasis( const KoXmlDocument& doc, KoOasisStyles&,
+                                      const KoXmlDocument&, KoStore* )
 {
     m_formulaElement->readMathML( doc.documentElement() );
 /*    if ( document->loadOasis( doc ) )
@@ -99,7 +99,7 @@
     return true;
 }
 
-bool KFormulaPartDocument::loadXML(QIODevice *, const QDomDocument& doc)
+bool KFormulaPartDocument::loadXML(QIODevice *, const KoXmlDocument& doc)
 {
     // TODO: Check whether it's really MathML or old KFO format
     m_formulaElement->readMathML( doc.documentElement() );
--- trunk/koffice/kformula/KFormulaPartDocument.h #692916:692917
@@ -30,7 +30,6 @@
 #include "kformula_export.h"
 
 class QIODevice;
-class QDomDocument;
 class KoXmlWriter;
 
 class FormulaElement;
--- trunk/koffice/kformula/flake/UnderOverElement.cpp #692916:692917
@@ -69,7 +69,7 @@
 
 bool UnderOverElement::readMathMLContent( const KoXmlElement& parent )
 {
-    KoXmlElement child = parent.firstChildElement();
+    KoXmlElement child = parent.firstChild().toElement();
     QString name = parent.tagName().toLower();
     
     if ( child.isNull() ) {
@@ -80,7 +80,7 @@
     m_baseElement = ElementFactory::createElement( child.tagName(), this );
 
     if( name.contains( "under" ) ) {
-        child = child.nextSiblingElement();
+        child = child.nextSibling().toElement();
         if ( child.isNull() ) {
             kWarning( 39001 ) << "Empty underscript in " << name << " element\n";
             return false;
@@ -89,7 +89,7 @@
         m_underElement = ElementFactory::createElement( child.tagName(), this );
     }
     if ( name.contains( "over" ) ) {
-        child = child.nextSiblingElement();
+        child = child.nextSibling().toElement();
         if ( child.isNull() ) {
             kWarning( 39001 ) << "Empty overscript in " << name << " element\n";
             return false;
--- trunk/koffice/kformula/flake/tests/TestLayout.cpp #692916:692917
@@ -31,7 +31,7 @@
 
 static QRectF layout(BasicElement* element, const QString& input)
 {
-    QDomDocument doc;
+    KoXmlDocument doc;
     doc.setContent( input );
     element->readMathML(doc.documentElement());
     AttributeManager am;
--- trunk/koffice/kformula/flake/tests/TestLoad.cpp #692916:692917
@@ -51,7 +51,7 @@
 
 static void load(BasicElement* element, const QString& input)
 {
-    QDomDocument doc;
+    KoXmlDocument doc;
     doc.setContent( input );
     element->readMathML(doc.documentElement());
 }
--- trunk/koffice/kformula/flake/tests/TestLoadAndSave.cpp #692916:692917
@@ -51,7 +51,7 @@
 
 static QString loadAndSave( BasicElement* element, const QString& input )
 {
-    QDomDocument doc;
+    KoXmlDocument doc;
     doc.setContent( input );
     element->readMathML( doc.documentElement() );
     QBuffer device;
[prev in list] [next in list] [prev in thread] [next in thread]