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

library: use extensions when loading std.cfg and posix.cfg

This commit is contained in:
Daniel Marjamäki 2013-12-26 13:18:54 +01:00
parent 6785f07458
commit 562387e3ff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/cppcheckexecutor.cpp
View File

@ -155,10 +155,10 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
bool std = settings.library.load(argv[0], "std"); bool std = settings.library.load(argv[0], "std.cfg");
bool posix = true; bool posix = true;
if (settings.standards.posix) if (settings.standards.posix)
posix = settings.library.load(argv[0], "posix"); posix = settings.library.load(argv[0], "posix.cfg");
if (!std || !posix) { if (!std || !posix) {
const std::list<ErrorLogger::ErrorMessage::FileLocation> callstack; const std::list<ErrorLogger::ErrorMessage::FileLocation> callstack;

4
gui/mainwindow.cpp
View File

@ -565,10 +565,10 @@ Settings MainWindow::GetCppcheckSettings()
result.standards.posix = mSettings->value(SETTINGS_STD_POSIX, false).toBool(); result.standards.posix = mSettings->value(SETTINGS_STD_POSIX, false).toBool();
const QString applicationFilePath = QCoreApplication::applicationFilePath(); const QString applicationFilePath = QCoreApplication::applicationFilePath();
bool std = result.library.load(applicationFilePath.toLatin1(), "std"); bool std = result.library.load(applicationFilePath.toLatin1(), "std.cfg");
bool posix = true; bool posix = true;
if (result.standards.posix) if (result.standards.posix)
posix = result.library.load(applicationFilePath.toLatin1(), "posix"); posix = result.library.load(applicationFilePath.toLatin1(), "posix.cfg");
if (!std || !posix) if (!std || !posix)
QMessageBox::warning(this, tr("Error"), tr("Failed to load %1. Your Cppcheck installation is broken.").arg(!std ? "std.cfg" : "posix.cfg")); QMessageBox::warning(this, tr("Error"), tr("Failed to load %1. Your Cppcheck installation is broken.").arg(!std ? "std.cfg" : "posix.cfg"));