Don't need parent of QObject to be set in Report -> Increase constness of ResultsView::Save()

PKEuS · PKEuS · commit 7c8f6173c1fe · 2012-10-27T12:22:56.000+02:00
- our code already deletes all Report instances; there is no need for garbage collector
diff --git a/gui/csvreport.cpp b/gui/csvreport.cpp
@@ -23,8 +23,8 @@
 #include "report.h"
 #include "csvreport.h"
 
-CsvReport::CsvReport(const QString &filename, QObject * parent) :
-    Report(filename, parent)
+CsvReport::CsvReport(const QString &filename) :
+    Report(filename)
 {
 }
 
diff --git a/gui/csvreport.h b/gui/csvreport.h
@@ -19,7 +19,6 @@
 #ifndef CSV_REPORT_H
 #define CSV_REPORT_H
 
-#include <QObject>
 #include <QString>
 #include <QTextStream>
 #include "report.h"
@@ -36,7 +35,7 @@
 */
 class CsvReport : public Report {
 public:
-    CsvReport(const QString &filename, QObject * parent = 0);
+    CsvReport(const QString &filename);
     virtual ~CsvReport();
 
     /**
diff --git a/gui/report.cpp b/gui/report.cpp
@@ -21,8 +21,7 @@
 #include <QFile>
 #include "report.h"
 
-Report::Report(const QString &filename, QObject * parent) :
-    QObject(parent),
+Report::Report(const QString &filename) :
     mFilename(filename)
 {
 }
diff --git a/gui/report.h b/gui/report.h
@@ -40,7 +40,7 @@ class Report : public QObject {
         CSV,
     };
 
-    Report(const QString &filename, QObject * parent = 0);
+    Report(const QString &filename);
     virtual ~Report();
 
     /**
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
@@ -132,7 +132,7 @@ void ResultsView::FilterResults(const QString& filter)
     mUI.mTree->FilterResults(filter);
 }
 
-void ResultsView::Save(const QString &filename, Report::Type type)
+void ResultsView::Save(const QString &filename, Report::Type type) const
 {
     if (!mErrorsFound) {
         QMessageBox msgBox;
@@ -145,16 +145,16 @@ void ResultsView::Save(const QString &filename, Report::Type type)
 
     switch (type) {
     case Report::CSV:
-        report = new CsvReport(filename, this);
+        report = new CsvReport(filename);
         break;
     case Report::TXT:
-        report = new TxtReport(filename, this);
+        report = new TxtReport(filename);
         break;
     case Report::XML:
-        report = new XmlReportV1(filename, this);
+        report = new XmlReportV1(filename);
         break;
     case Report::XMLV2:
-        report = new XmlReportV2(filename, this);
+        report = new XmlReportV2(filename);
         break;
     }
 
@@ -272,9 +272,9 @@ void ResultsView::ReadErrorsXml(const QString &filename)
 
     XmlReport *report = NULL;
     if (version == 1)
-        report = new XmlReportV1(filename, this);
+        report = new XmlReportV1(filename);
     else if (version == 2)
-        report = new XmlReportV2(filename, this);
+        report = new XmlReportV2(filename);
 
     QList<ErrorItem> errors;
     if (report) {
diff --git a/gui/resultsview.h b/gui/resultsview.h
@@ -73,7 +73,7 @@ class ResultsView : public QWidget {
     * @param filename Filename to save results to
     * @param type Type of the report.
     */
-    void Save(const QString &filename, Report::Type type);
+    void Save(const QString &filename, Report::Type type) const;
 
     /**
     * @brief Update tree settings
diff --git a/gui/txtreport.cpp b/gui/txtreport.cpp
@@ -19,8 +19,8 @@
 #include <QDir>
 #include "txtreport.h"
 
-TxtReport::TxtReport(const QString &filename, QObject * parent) :
-    Report(filename, parent)
+TxtReport::TxtReport(const QString &filename) :
+    Report(filename)
 {
 }
 
diff --git a/gui/txtreport.h b/gui/txtreport.h
@@ -19,7 +19,6 @@
 #ifndef TXT_REPORT_H
 #define TXT_REPORT_H
 
-#include <QObject>
 #include <QString>
 #include <QTextStream>
 #include "report.h"
@@ -36,7 +35,7 @@ class TxtReport : public Report {
     Q_OBJECT
 
 public:
-    TxtReport(const QString &filename, QObject * parent = 0);
+    TxtReport(const QString &filename);
     virtual ~TxtReport();
 
     /**
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
@@ -26,8 +26,8 @@
 static const char ResultElementName[] = "results";
 static const char VersionAttribute[] = "version";
 
-XmlReport::XmlReport(const QString &filename, QObject * parent) :
-    Report(filename, parent)
+XmlReport::XmlReport(const QString &filename) :
+    Report(filename)
 {
 }
 
diff --git a/gui/xmlreport.h b/gui/xmlreport.h
@@ -35,7 +35,7 @@ class QObject;
 */
 class XmlReport : public Report {
 public:
-    XmlReport(const QString &filename, QObject * parent = 0);
+    XmlReport(const QString &filename);
 
     /**
      * @brief Read contents of the report file.
diff --git a/gui/xmlreportv1.cpp b/gui/xmlreportv1.cpp
@@ -35,8 +35,8 @@ static const char IdAttribute[] = "id";
 static const char SeverityAttribute[] = "severity";
 static const char MsgAttribute[] = "msg";
 
-XmlReportV1::XmlReportV1(const QString &filename, QObject * parent) :
-    XmlReport(filename, parent),
+XmlReportV1::XmlReportV1(const QString &filename) :
+    XmlReport(filename),
     mXmlReader(NULL),
     mXmlWriter(NULL)
 {
diff --git a/gui/xmlreportv1.h b/gui/xmlreportv1.h
@@ -19,7 +19,6 @@
 #ifndef XML_REPORTV1_H
 #define XML_REPORTV1_H
 
-#include <QObject>
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
@@ -36,7 +35,7 @@
 */
 class XmlReportV1 : public XmlReport {
 public:
-    XmlReportV1(const QString &filename, QObject * parent = 0);
+    XmlReportV1(const QString &filename);
     virtual ~XmlReportV1();
 
     /**
diff --git a/gui/xmlreportv2.cpp b/gui/xmlreportv2.cpp
@@ -41,8 +41,8 @@ static const char MsgAttribute[] = "msg";
 static const char VersionAttribute[] = "version";
 static const char VerboseAttribute[] = "verbose";
 
-XmlReportV2::XmlReportV2(const QString &filename, QObject * parent) :
-    XmlReport(filename, parent),
+XmlReportV2::XmlReportV2(const QString &filename) :
+    XmlReport(filename),
     mXmlReader(NULL),
     mXmlWriter(NULL)
 {
diff --git a/gui/xmlreportv2.h b/gui/xmlreportv2.h
@@ -36,7 +36,7 @@
 */
 class XmlReportV2 : public XmlReport {
 public:
-    XmlReportV2(const QString &filename, QObject * parent = 0);
+    XmlReportV2(const QString &filename);
     virtual ~XmlReportV2();
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`	`#include "report.h"`
`24`	`24`	`#include "csvreport.h"`
`25`	`25`
`26`		`-CsvReport::CsvReport(const QString &filename, QObject * parent) :`
`27`		`- Report(filename, parent)`
	`26`	`+CsvReport::CsvReport(const QString &filename) :`
	`27`	`+ Report(filename)`
`28`	`28`	`{`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@`
`21`	`21`	`#include <QFile>`
`22`	`22`	`#include "report.h"`
`23`	`23`
`24`		`-Report::Report(const QString &filename, QObject * parent) :`
`25`		`- QObject(parent),`
	`24`	`+Report::Report(const QString &filename) :`
`26`	`25`	`mFilename(filename)`
`27`	`26`	`{`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`	`#include <QDir>`
`20`	`20`	`#include "txtreport.h"`
`21`	`21`
`22`		`-TxtReport::TxtReport(const QString &filename, QObject * parent) :`
`23`		`- Report(filename, parent)`
	`22`	`+TxtReport::TxtReport(const QString &filename) :`
	`23`	`+ Report(filename)`
`24`	`24`	`{`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@`
`26`	`26`	`static const char ResultElementName[] = "results";`
`27`	`27`	`static const char VersionAttribute[] = "version";`
`28`	`28`
`29`		`-XmlReport::XmlReport(const QString &filename, QObject * parent) :`
`30`		`- Report(filename, parent)`
	`29`	`+XmlReport::XmlReport(const QString &filename) :`
	`30`	`+ Report(filename)`
`31`	`31`	`{`
`32`	`32`	`}`
`33`	`33`