GUI: Removed XML format version 1

PKEuS · PKEuS · commit 2aa1523a2d57 · 2017-07-29T19:36:19.000+02:00
diff --git a/gui/gui.pro b/gui/gui.pro
@@ -106,7 +106,6 @@ HEADERS += aboutdialog.h \
            translationhandler.h \
            txtreport.h \
            xmlreport.h \
-           xmlreportv1.h \
            xmlreportv2.h \
     librarydialog.h \
     cppchecklibrarydata.h \
@@ -144,7 +143,6 @@ SOURCES += aboutdialog.cpp \
            translationhandler.cpp \
            txtreport.cpp \
            xmlreport.cpp \
-           xmlreportv1.cpp \
            xmlreportv2.cpp \
     librarydialog.cpp \
     cppchecklibrarydata.cpp \
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -1157,7 +1157,7 @@ void MainWindow::performSelectedFilesCheck(QStringList selectedFilesList)
 void MainWindow::save()
 {
     QString selectedFilter;
-    const QString filter(tr("XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv)"));
+    const QString filter(tr("XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)"));
     QString selectedFile = QFileDialog::getSaveFileName(this,
                            tr("Save the report file"),
                            getPath(SETTINGS_LAST_RESULT_PATH),
@@ -1166,14 +1166,7 @@ void MainWindow::save()
 
     if (!selectedFile.isEmpty()) {
         Report::Type type = Report::TXT;
-        if (selectedFilter == tr("XML files version 1 (*.xml)")) {
-            QMessageBox msgBox(QMessageBox::Icon::Warning, tr("Deprecated XML format"), tr("XML format 1 is deprecated and will be removed in cppcheck 1.81."), QMessageBox::StandardButton::Ok);
-            msgBox.exec();
-
-            type = Report::XML;
-            if (!selectedFile.endsWith(".xml", Qt::CaseInsensitive))
-                selectedFile += ".xml";
-        } else if (selectedFilter == tr("XML files version 2 (*.xml)")) {
+        if (selectedFilter == tr("XML files (*.xml)")) {
             type = Report::XMLV2;
             if (!selectedFile.endsWith(".xml", Qt::CaseInsensitive))
                 selectedFile += ".xml";
@@ -1187,7 +1180,7 @@ void MainWindow::save()
                 selectedFile += ".csv";
         } else {
             if (selectedFile.endsWith(".xml", Qt::CaseInsensitive))
-                type = Report::XML;
+                type = Report::XMLV2;
             else if (selectedFile.endsWith(".txt", Qt::CaseInsensitive))
                 type = Report::TXT;
             else if (selectedFile.endsWith(".csv", Qt::CaseInsensitive))
diff --git a/gui/report.h b/gui/report.h
@@ -35,7 +35,6 @@ class Report : public QObject {
 
     enum Type {
         TXT,
-        XML,
         XMLV2,
         CSV,
     };
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
@@ -33,7 +33,6 @@
 #include "report.h"
 #include "txtreport.h"
 #include "xmlreport.h"
-#include "xmlreportv1.h"
 #include "xmlreportv2.h"
 #include "csvreport.h"
 #include "printablereport.h"
@@ -153,9 +152,6 @@ void ResultsView::save(const QString &filename, Report::Type type) const
     case Report::TXT:
         report = new TxtReport(filename);
         break;
-    case Report::XML:
-        report = new XmlReportV1(filename);
-        break;
     case Report::XMLV2:
         report = new XmlReportV2(filename);
         break;
@@ -313,12 +309,15 @@ void ResultsView::readErrorsXml(const QString &filename)
         msgBox.exec();
         return;
     }
+    if (version == 1) {
+        QMessageBox msgBox;
+        msgBox.setText(tr("XML format version 1 is no longer supported."));
+        msgBox.setIcon(QMessageBox::Critical);
+        msgBox.exec();
+        return;
+    }
 
-    XmlReport *report = NULL;
-    if (version == 1)
-        report = new XmlReportV1(filename);
-    else if (version == 2)
-        report = new XmlReportV2(filename);
+    XmlReport *report = new XmlReportV2(filename);
 
     QList<ErrorItem> errors;
     if (report) {
diff --git a/gui/xmlreportv1.cpp b/gui/xmlreportv1.cpp
diff --git a/gui/xmlreportv1.h b/gui/xmlreportv1.h

-Original file line number
+Diff line change
     enum Type {
         TXT,
 -        XML,
         XMLV2,
         CSV,
     };