Merge branch 'master' into project

danmar · danmar · commit f83661b20604 · 2016-08-07T15:36:35.000+02:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -750,9 +750,11 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
         PrintMessage("cppcheck: unusedFunction check can't be used with '-j' option. Disabling unusedFunction check.");
     }
 
-    if (_settings->inconclusive && _settings->xml && _settings->xml_version == 1U) {
-        PrintMessage("cppcheck: inconclusive messages will not be shown, because the old xml format is not compatible. It's recommended to use the new xml format (use --xml-version=2).");
-    }
+    // Warn about XML format 1, which will be removed in cppcheck 1.81
+    if (_settings->xml_version == 1U)
+        PrintMessage("cppcheck: XML format version 1 is deprecated and will be removed in cppcheck 1.81. Use '--xml-version=2'.");
+    if (_settings->inconclusive && _settings->xml && _settings->xml_version == 1U)
+        PrintMessage("cppcheck: inconclusive messages will not be shown, because the old xml format is not compatible.");
 
     if (argc <= 1) {
         _showHelp = true;
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -1064,6 +1064,9 @@ 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";
