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

GUI: You can now select Visual Studio files and Compile databases in the Check files dialog

This commit is contained in:
Daniel Marjamäki 2016-08-20 13:32:48 +02:00
parent 0126421711
commit 9cced993aa
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gui/mainwindow.cpp
View File

@ -382,6 +382,7 @@ void MainWindow::DoCheckProject(ImportProject p)
mUI.mResults->SetCheckDirectory(checkPath); mUI.mResults->SetCheckDirectory(checkPath);
Settings checkSettings = GetCppcheckSettings(); Settings checkSettings = GetCppcheckSettings();
checkSettings.force = false;
if (mProject) if (mProject)
qDebug() << "Checking project file" << mProject->GetProjectFile()->GetFilename(); qDebug() << "Checking project file" << mProject->GetProjectFile()->GetFilename();
@ -487,7 +488,7 @@ 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 (%1)").arg(FileList::GetDefaultFilters().join(" "))); tr("C/C++ Source, Visual Studio, Compile database (%1 *.sln *.vcxproj compile_database.json)").arg(FileList::GetDefaultFilters().join(" ")));
if (selected.isEmpty()) if (selected.isEmpty())
mCurrentDirectory.clear(); mCurrentDirectory.clear();
else { else {
@ -515,7 +516,17 @@ QStringList MainWindow::SelectFilesToCheck(QFileDialog::FileMode mode)
void MainWindow::CheckFiles() void MainWindow::CheckFiles()
{ {
DoCheckFiles(SelectFilesToCheck(QFileDialog::ExistingFiles)); QStringList selected = SelectFilesToCheck(QFileDialog::ExistingFiles);
const QString file0 = (selected.size() ? selected[0].toLower() : "");
if (file0.endsWith(".sln") || file0.endsWith(".vcxproj") || file0.endsWith("compile_database.json")) {
ImportProject p;
p.import(selected[0].toStdString());
DoCheckProject(p);
return;
}
DoCheckFiles(selected);
} }
void MainWindow::CheckDirectory() void MainWindow::CheckDirectory()
@ -732,8 +743,6 @@ Settings MainWindow::GetCppcheckSettings()
result.quiet = false; result.quiet = false;
result.verbose = true; result.verbose = true;
result.force = mSettings->value(SETTINGS_CHECK_FORCE, 1).toBool(); result.force = mSettings->value(SETTINGS_CHECK_FORCE, 1).toBool();
if (mProject && !mProject->GetProjectFile()->GetImportProject().isEmpty())
result.force = false;
result.xml = false; result.xml = false;
result.jobs = mSettings->value(SETTINGS_CHECK_THREADS, 1).toInt(); result.jobs = mSettings->value(SETTINGS_CHECK_THREADS, 1).toInt();
result.inlineSuppressions = mSettings->value(SETTINGS_INLINE_SUPPRESSIONS, false).toBool(); result.inlineSuppressions = mSettings->value(SETTINGS_INLINE_SUPPRESSIONS, false).toBool();