Fixed compile error
This commit is contained in:
parent
e297e3a505
commit
53967c83e9
|
@ -189,7 +189,7 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
|
||||||
} else if (endsWith(filename, ".bpr", 4)) {
|
} else if (endsWith(filename, ".bpr", 4)) {
|
||||||
importBcb6Prj(filename);
|
importBcb6Prj(filename);
|
||||||
return ImportProject::Type::BORLAND;
|
return ImportProject::Type::BORLAND;
|
||||||
} else if (endsWith(filename, ".cppcheck", 9)) {
|
} else if (settings && endsWith(filename, ".cppcheck", 9)) {
|
||||||
return importCppcheckGuiProject(fin, settings) ? ImportProject::Type::CPPCHECK_GUI : ImportProject::Type::MISSING;
|
return importCppcheckGuiProject(fin, settings) ? ImportProject::Type::CPPCHECK_GUI : ImportProject::Type::MISSING;
|
||||||
}
|
}
|
||||||
return ImportProject::Type::UNKNOWN;
|
return ImportProject::Type::UNKNOWN;
|
||||||
|
|
|
@ -94,7 +94,7 @@ public:
|
||||||
void ignoreOtherConfigs(const std::string &cfg);
|
void ignoreOtherConfigs(const std::string &cfg);
|
||||||
void ignoreOtherPlatforms(cppcheck::Platform::PlatformType platformType);
|
void ignoreOtherPlatforms(cppcheck::Platform::PlatformType platformType);
|
||||||
|
|
||||||
Type import(const std::string &filename, Settings *settings);
|
Type import(const std::string &filename, Settings *settings=nullptr);
|
||||||
protected:
|
protected:
|
||||||
void importCompileCommands(std::istream &istr);
|
void importCompileCommands(std::istream &istr);
|
||||||
bool importCppcheckGuiProject(std::istream &istr, Settings *settings);
|
bool importCppcheckGuiProject(std::istream &istr, Settings *settings);
|
||||||
|
|
Loading…
Reference in New Issue