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

Fixed #7746 (Cppcheck can not open compile_commands.json (only compile_database.json))

This commit is contained in:
Daniel Marjamäki 2016-10-01 11:25:58 +02:00
parent 9dcad7115a
commit 1beb22a247
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gui/mainwindow.cpp
View File

@ -48,6 +48,7 @@
#include "librarydialog.h" #include "librarydialog.h"
static const QString OnlineHelpURL("http://cppcheck.net/manual.html"); static const QString OnlineHelpURL("http://cppcheck.net/manual.html");
static const QString compile_commands_json("compile_commands.json");
MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) : MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
mSettings(settings), mSettings(settings),
@ -489,7 +490,9 @@ QStringList MainWindow::SelectFilesToCheck(QFileDialog::FileMode mode)
selected = QFileDialog::getOpenFileNames(this, selected = QFileDialog::getOpenFileNames(this,
tr("Select files to check"), tr("Select files to check"),
GetPath(SETTINGS_LAST_CHECK_PATH), GetPath(SETTINGS_LAST_CHECK_PATH),
tr("C/C++ Source, Visual Studio, Compile database (%1 *.sln *.vcxproj compile_database.json)").arg(FileList::GetDefaultFilters().join(" "))); tr("C/C++ Source, Compile database, Visual Studio (%1 %2 *.sln *.vcxproj)")
.arg(FileList::GetDefaultFilters().join(" "))
.arg(compile_commands_json));
if (selected.isEmpty()) if (selected.isEmpty())
mCurrentDirectory.clear(); mCurrentDirectory.clear();
else { else {
@ -520,7 +523,7 @@ void MainWindow::CheckFiles()
QStringList selected = SelectFilesToCheck(QFileDialog::ExistingFiles); QStringList selected = SelectFilesToCheck(QFileDialog::ExistingFiles);
const QString file0 = (selected.size() ? selected[0].toLower() : ""); const QString file0 = (selected.size() ? selected[0].toLower() : "");
if (file0.endsWith(".sln") || file0.endsWith(".vcxproj") || file0.endsWith("compile_database.json")) { if (file0.endsWith(".sln") || file0.endsWith(".vcxproj") || file0.endsWith(compile_commands_json)) {
ImportProject p; ImportProject p;
p.import(selected[0].toStdString()); p.import(selected[0].toStdString());