walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' into project

This commit is contained in:
Daniel Marjamäki 2016-08-07 15:36:35 +02:00
parent 4dbdb50317 ec4a85ecef
commit f83661b206
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/cmdlineparser.cpp
View File

@ -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;

3
gui/mainwindow.cpp
View File

@ -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";