From 9cced993aa8bff544c939ab138fd3c482f001664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 20 Aug 2016 13:32:48 +0200 Subject: [PATCH] GUI: You can now select Visual Studio files and Compile databases in the Check files dialog --- gui/mainwindow.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index e30731b7a..68b987629 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -382,6 +382,7 @@ void MainWindow::DoCheckProject(ImportProject p) mUI.mResults->SetCheckDirectory(checkPath); Settings checkSettings = GetCppcheckSettings(); + checkSettings.force = false; if (mProject) qDebug() << "Checking project file" << mProject->GetProjectFile()->GetFilename(); @@ -487,7 +488,7 @@ QStringList MainWindow::SelectFilesToCheck(QFileDialog::FileMode mode) selected = QFileDialog::getOpenFileNames(this, tr("Select files to check"), 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()) mCurrentDirectory.clear(); else { @@ -515,7 +516,17 @@ QStringList MainWindow::SelectFilesToCheck(QFileDialog::FileMode mode) 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() @@ -732,8 +743,6 @@ Settings MainWindow::GetCppcheckSettings() result.quiet = false; result.verbose = true; result.force = mSettings->value(SETTINGS_CHECK_FORCE, 1).toBool(); - if (mProject && !mProject->GetProjectFile()->GetImportProject().isEmpty()) - result.force = false; result.xml = false; result.jobs = mSettings->value(SETTINGS_CHECK_THREADS, 1).toInt(); result.inlineSuppressions = mSettings->value(SETTINGS_INLINE_SUPPRESSIONS, false).toBool();