GUI: Refactoring xmlreport to use pointer to stream writing class.

kimmov · kimmov · commit 81449a823a22 · 2010-07-10T13:53:44.000+03:00
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
@@ -21,12 +21,14 @@
 #include "xmlreport.h"
 
 XmlReport::XmlReport(const QString &filename, QObject * parent) :
-    Report(filename, parent)
+    Report(filename, parent),
+    mXmlWriter(NULL)
 {
 }
 
 XmlReport::~XmlReport()
 {
+    delete mXmlWriter;
     Close();
 }
 
@@ -35,23 +37,23 @@ bool XmlReport::Create()
     bool success = false;
     if (Report::Create())
     {
-        mXmlWriter.setDevice(Report::GetFile());
+        mXmlWriter = new QXmlStreamWriter(Report::GetFile());
         success = true;
     }
     return success;
 }
 
 void XmlReport::WriteHeader()
 {
-    mXmlWriter.setAutoFormatting(true);
-    mXmlWriter.writeStartDocument();
-    mXmlWriter.writeStartElement("results");
+    mXmlWriter->setAutoFormatting(true);
+    mXmlWriter->writeStartDocument();
+    mXmlWriter->writeStartElement("results");
 }
 
 void XmlReport::WriteFooter()
 {
-    mXmlWriter.writeEndElement();
-    mXmlWriter.writeEndDocument();
+    mXmlWriter->writeEndElement();
+    mXmlWriter->writeEndDocument();
 }
 
 void XmlReport::WriteError(const QStringList &files, const QStringList &lines,
@@ -63,11 +65,11 @@ void XmlReport::WriteError(const QStringList &files, const QStringList &lines,
     The callstack seems to be ignored here aswell, instead last item of the stack is used
     */
 
-    mXmlWriter.writeStartElement("error");
-    mXmlWriter.writeAttribute("file", files[files.size() - 1]);
-    mXmlWriter.writeAttribute("line", lines[lines.size() - 1]);
-    mXmlWriter.writeAttribute("id", id);
-    mXmlWriter.writeAttribute("severity", severity);
-    mXmlWriter.writeAttribute("msg", msg);
-    mXmlWriter.writeEndElement();
+    mXmlWriter->writeStartElement("error");
+    mXmlWriter->writeAttribute("file", files[files.size() - 1]);
+    mXmlWriter->writeAttribute("line", lines[lines.size() - 1]);
+    mXmlWriter->writeAttribute("id", id);
+    mXmlWriter->writeAttribute("severity", severity);
+    mXmlWriter->writeAttribute("msg", msg);
+    mXmlWriter->writeEndElement();
 }
diff --git a/gui/xmlreport.h b/gui/xmlreport.h
@@ -68,7 +68,7 @@ class XmlReport : public Report
     /**
     * @brief XML stream writer for writing the report in XML format.
     */
-    QXmlStreamWriter mXmlWriter;
+    QXmlStreamWriter *mXmlWriter;
 };
 /// @}
 #endif // XML_REPORT_H

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,14 @@`
`21`	`21`	`#include "xmlreport.h"`
`22`	`22`
`23`	`23`	`XmlReport::XmlReport(const QString &filename, QObject * parent) :`
`24`		`- Report(filename, parent)`
	`24`	`+ Report(filename, parent),`
	`25`	`+ mXmlWriter(NULL)`
`25`	`26`	`{`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`XmlReport::~XmlReport()`
`29`	`30`	`{`
	`31`	`+ delete mXmlWriter;`
`30`	`32`	`Close();`
`31`	`33`	`}`
`32`	`34`
`@@ -35,23 +37,23 @@ bool XmlReport::Create()`
`35`	`37`	`bool success = false;`
`36`	`38`	`if (Report::Create())`
`37`	`39`	`{`
`38`		`- mXmlWriter.setDevice(Report::GetFile());`
	`40`	`+ mXmlWriter = new QXmlStreamWriter(Report::GetFile());`
`39`	`41`	`success = true;`
`40`	`42`	`}`
`41`	`43`	`return success;`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`void XmlReport::WriteHeader()`
`45`	`47`	`{`
`46`		`- mXmlWriter.setAutoFormatting(true);`
`47`		`- mXmlWriter.writeStartDocument();`
`48`		`- mXmlWriter.writeStartElement("results");`
	`48`	`+ mXmlWriter->setAutoFormatting(true);`
	`49`	`+ mXmlWriter->writeStartDocument();`
	`50`	`+ mXmlWriter->writeStartElement("results");`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`void XmlReport::WriteFooter()`
`52`	`54`	`{`
`53`		`- mXmlWriter.writeEndElement();`
`54`		`- mXmlWriter.writeEndDocument();`
	`55`	`+ mXmlWriter->writeEndElement();`
	`56`	`+ mXmlWriter->writeEndDocument();`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`void XmlReport::WriteError(const QStringList &files, const QStringList &lines,`
`@@ -63,11 +65,11 @@ void XmlReport::WriteError(const QStringList &files, const QStringList &lines,`
`63`	`65`	`The callstack seems to be ignored here aswell, instead last item of the stack is used`
`64`	`66`	`*/`
`65`	`67`
`66`		`- mXmlWriter.writeStartElement("error");`
`67`		`- mXmlWriter.writeAttribute("file", files[files.size() - 1]);`
`68`		`- mXmlWriter.writeAttribute("line", lines[lines.size() - 1]);`
`69`		`- mXmlWriter.writeAttribute("id", id);`
`70`		`- mXmlWriter.writeAttribute("severity", severity);`
`71`		`- mXmlWriter.writeAttribute("msg", msg);`
`72`		`- mXmlWriter.writeEndElement();`
	`68`	`+ mXmlWriter->writeStartElement("error");`
	`69`	`+ mXmlWriter->writeAttribute("file", files[files.size() - 1]);`
	`70`	`+ mXmlWriter->writeAttribute("line", lines[lines.size() - 1]);`
	`71`	`+ mXmlWriter->writeAttribute("id", id);`
	`72`	`+ mXmlWriter->writeAttribute("severity", severity);`
	`73`	`+ mXmlWriter->writeAttribute("msg", msg);`
	`74`	`+ mXmlWriter->writeEndElement();`
`73`	`75`	`}`