Remove the private class XmlStreamWriter and XmlStreamReader

tests/auto/styles/tst_stylestest.cpp

@@ -1,9 +1,9 @@
 #include "private/xlsxstyles_p.h"
-#include "private/xlsxxmlreader_p.h"
 #include "xlsxformat.h"
 #include "private/xlsxformat_p.h"
 #include <QString>
 #include <QtTest>
+#include <QXmlStreamReader>
 
 class StylesTest : public QObject
 {
@@ -104,7 +104,7 @@ void StylesTest::testReadFonts()
             "<font><b/><u val=\"double\"/><sz val=\"11\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>"
             "</fonts>";
     QXlsx::Styles styles(true);
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//So current node is fonts
     styles.readFonts(reader);
 
@@ -123,7 +123,7 @@ void StylesTest::testReadFills()
             "<fill><patternFill patternType=\"solid\"><fgColor rgb=\"FFa0a0a4\"/></patternFill></fill>"
             "</fills>";
     QXlsx::Styles styles(true);
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//So current node is fills
     styles.readFills(reader);
 
@@ -140,7 +140,7 @@ void StylesTest::testReadBorders()
             "</borders>";
 
     QXlsx::Styles styles(true);
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//So current node is borders
     styles.readBorders(reader);
 
@@ -155,7 +155,7 @@ void StylesTest::testReadNumFmts()
             "</numFmts>";
 
     QXlsx::Styles styles(true);
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//So current node is numFmts
     styles.readNumFmts(reader);
 

tests/auto/worksheet/tst_worksheet.cpp

@@ -1,12 +1,12 @@
 #include <QBuffer>
 #include <QtTest>
+#include <QXmlStreamReader>
 
 #include "xlsxworksheet.h"
 #include "xlsxcell.h"
 #include "xlsxcellrange.h"
 #include "xlsxdatavalidation.h"
 #include "private/xlsxworksheet_p.h"
-#include "private/xlsxxmlreader_p.h"
 #include "private/xlsxsharedstrings_p.h"
 #include "xlsxrichstring.h"
 
@@ -194,7 +194,7 @@ void WorksheetTest::testReadSheetData()
             "<c r=\"E3\" t=\"e\"><f>1/0</f><v>#DIV/0!</v></c>"
             "</row>"
             "</sheetData>";
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//current node is sheetData
 
     QXlsx::Worksheet sheet("", 1, 0);
@@ -235,7 +235,7 @@ void WorksheetTest::testReadColsInfo()
     const QByteArray xmlData = "<cols>"
             "<col min=\"9\" max=\"15\" width=\"5\" style=\"4\" customWidth=\"1\"/>"
             "</cols>";
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//current node is cols
 
     QXlsx::Worksheet sheet("", 1, 0);
@@ -255,7 +255,7 @@ void WorksheetTest::testReadRowsInfo()
             "<c r=\"B3\" s=\"3\"><v>12345</v></c>"
             "</row>"
             "</sheetData>";
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//current node is sheetData
 
     QXlsx::Worksheet sheet("", 1, 0);
@@ -269,7 +269,7 @@ void WorksheetTest::testReadMergeCells()
 {
     const QByteArray xmlData = "<mergeCells count=\"2\"><mergeCell ref=\"B1:B5\"/><mergeCell ref=\"E2:G4\"/></mergeCells>";
 
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//current node is mergeCells
 
     QXlsx::Worksheet sheet("", 1, 0);
@@ -286,7 +286,7 @@ void WorksheetTest::testReadDataValidations()
             "<dataValidation type=\"whole\" showInputMessage=\"1\" showErrorMessage=\"1\" sqref=\"A1 C2:C4\"><formula1>10</formula1><formula2>100</formula2></dataValidation>"
             "</dataValidations>";
 
-    QXlsx::XmlStreamReader reader(xmlData);
+    QXmlStreamReader reader(xmlData);
     reader.readNextStartElement();//current node is dataValidations
 
     QXlsx::Worksheet sheet("", 1, 0);