1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 14:08:35 +08:00

clang-tidy: Blacklist violations for version 8

Check the codebase with clang-tidy version 8, fix the low hanging
fruits, blacklist the rest.
This commit is contained in:
Regina Pfeifer
2019-07-30 12:38:24 +02:00
parent 473f288e97
commit 4af094c8df
11 changed files with 20 additions and 15 deletions

View File

@@ -3,16 +3,21 @@ Checks: "-*,\
bugprone-*,\ bugprone-*,\
-bugprone-macro-parentheses,\ -bugprone-macro-parentheses,\
-bugprone-misplaced-widening-cast,\ -bugprone-misplaced-widening-cast,\
-bugprone-narrowing-conversions,\
-bugprone-too-small-loop-variable,\
google-readability-casting,\ google-readability-casting,\
misc-*,\ misc-*,\
-misc-incorrect-roundings,\ -misc-incorrect-roundings,\
-misc-macro-parentheses,\ -misc-macro-parentheses,\
-misc-misplaced-widening-cast,\ -misc-misplaced-widening-cast,\
-misc-non-private-member-variables-in-classes,\
-misc-static-assert,\ -misc-static-assert,\
modernize-*,\ modernize-*,\
-modernize-avoid-c-arrays,\
-modernize-deprecated-headers,\ -modernize-deprecated-headers,\
-modernize-return-braced-init-list,\ -modernize-return-braced-init-list,\
-modernize-use-auto,\ -modernize-use-auto,\
-modernize-use-nodiscard,\
-modernize-use-noexcept,\ -modernize-use-noexcept,\
-modernize-use-transparent-functors,\ -modernize-use-transparent-functors,\
-modernize-use-using,\ -modernize-use-using,\
@@ -24,8 +29,11 @@ readability-*,\
-readability-implicit-bool-cast,\ -readability-implicit-bool-cast,\
-readability-implicit-bool-conversion,\ -readability-implicit-bool-conversion,\
-readability-inconsistent-declaration-parameter-name,\ -readability-inconsistent-declaration-parameter-name,\
-readability-isolate-declaration,\
-readability-magic-numbers,\
-readability-named-parameter,\ -readability-named-parameter,\
-readability-redundant-declaration,\ -readability-redundant-declaration,\
-readability-uppercase-literal-suffix,\
" "
HeaderFilterRegex: 'Source/cm[^/]*\.(h|hxx|cxx)$' HeaderFilterRegex: 'Source/cm[^/]*\.(h|hxx|cxx)$'
CheckOptions: CheckOptions:

View File

@@ -110,7 +110,8 @@ cmParseBlanketJSCoverage::cmParseBlanketJSCoverage(
{ {
} }
bool cmParseBlanketJSCoverage::LoadCoverageData(std::vector<std::string> files) bool cmParseBlanketJSCoverage::LoadCoverageData(
std::vector<std::string> const& files)
{ {
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"Found " << files.size() << " Files" << std::endl, "Found " << files.size() << " Files" << std::endl,

View File

@@ -29,7 +29,7 @@ class cmParseBlanketJSCoverage
public: public:
cmParseBlanketJSCoverage(cmCTestCoverageHandlerContainer& cont, cmParseBlanketJSCoverage(cmCTestCoverageHandlerContainer& cont,
cmCTest* ctest); cmCTest* ctest);
bool LoadCoverageData(std::vector<std::string> files); bool LoadCoverageData(std::vector<std::string> const& files);
// Read the JSON output // Read the JSON output
bool ReadJSONFile(std::string const& file); bool ReadJSONFile(std::string const& file);

View File

@@ -684,7 +684,6 @@ void cmFileAPI::BuildClientRequestCodeModel(
Json::Value cmFileAPI::BuildCodeModel(Object const& object) Json::Value cmFileAPI::BuildCodeModel(Object const& object)
{ {
using namespace std::placeholders;
Json::Value codemodel = cmFileAPICodemodelDump(*this, object.Version); Json::Value codemodel = cmFileAPICodemodelDump(*this, object.Version);
codemodel["kind"] = this->ObjectKindName(object.Kind); codemodel["kind"] = this->ObjectKindName(object.Kind);
@@ -719,7 +718,6 @@ void cmFileAPI::BuildClientRequestCache(
Json::Value cmFileAPI::BuildCache(Object const& object) Json::Value cmFileAPI::BuildCache(Object const& object)
{ {
using namespace std::placeholders;
Json::Value cache = cmFileAPICacheDump(*this, object.Version); Json::Value cache = cmFileAPICacheDump(*this, object.Version);
cache["kind"] = this->ObjectKindName(object.Kind); cache["kind"] = this->ObjectKindName(object.Kind);
@@ -754,7 +752,6 @@ void cmFileAPI::BuildClientRequestCMakeFiles(
Json::Value cmFileAPI::BuildCMakeFiles(Object const& object) Json::Value cmFileAPI::BuildCMakeFiles(Object const& object)
{ {
using namespace std::placeholders;
Json::Value cmakeFiles = cmFileAPICMakeFilesDump(*this, object.Version); Json::Value cmakeFiles = cmFileAPICMakeFilesDump(*this, object.Version);
cmakeFiles["kind"] = this->ObjectKindName(object.Kind); cmakeFiles["kind"] = this->ObjectKindName(object.Kind);

View File

@@ -287,7 +287,7 @@ class Target
Json::ArrayIndex si); Json::ArrayIndex si);
void AddBacktrace(Json::Value& object, cmListFileBacktrace const& bt); void AddBacktrace(Json::Value& object, cmListFileBacktrace const& bt);
Json::Value DumpPaths(); Json::Value DumpPaths();
Json::Value DumpCompileData(CompileData cd); Json::Value DumpCompileData(CompileData const& cd);
Json::Value DumpInclude(CompileData::IncludeEntry const& inc); Json::Value DumpInclude(CompileData::IncludeEntry const& inc);
Json::Value DumpDefine(BT<std::string> const& def); Json::Value DumpDefine(BT<std::string> const& def);
Json::Value DumpSources(); Json::Value DumpSources();
@@ -915,7 +915,7 @@ Json::Value Target::DumpSource(cmGeneratorTarget::SourceAndKind const& sk,
return source; return source;
} }
Json::Value Target::DumpCompileData(CompileData cd) Json::Value Target::DumpCompileData(CompileData const& cd)
{ {
Json::Value result = Json::objectValue; Json::Value result = Json::objectValue;

View File

@@ -41,7 +41,7 @@ bool cmNewLineStyle::ReadFromArguments(const std::vector<std::string>& args,
return true; return true;
} }
const std::string cmNewLineStyle::GetCharacters() const std::string cmNewLineStyle::GetCharacters() const
{ {
switch (NewLineStyle) { switch (NewLineStyle) {
case Invalid: case Invalid:

View File

@@ -30,7 +30,7 @@ public:
bool ReadFromArguments(const std::vector<std::string>& args, bool ReadFromArguments(const std::vector<std::string>& args,
std::string& errorString); std::string& errorString);
const std::string GetCharacters() const; std::string GetCharacters() const;
private: private:
Style NewLineStyle = Invalid; Style NewLineStyle = Invalid;

View File

@@ -378,8 +378,7 @@ void cmServerProtocol1::HandleCMakeFileChanges(const std::string& path,
SendSignal(kFILE_CHANGE_SIGNAL, obj); SendSignal(kFILE_CHANGE_SIGNAL, obj);
} }
const cmServerResponse cmServerProtocol1::Process( cmServerResponse cmServerProtocol1::Process(const cmServerRequest& request)
const cmServerRequest& request)
{ {
assert(this->m_State >= STATE_ACTIVE); assert(this->m_State >= STATE_ACTIVE);

View File

@@ -80,7 +80,7 @@ public:
virtual std::pair<int, int> ProtocolVersion() const = 0; virtual std::pair<int, int> ProtocolVersion() const = 0;
virtual bool IsExperimental() const = 0; virtual bool IsExperimental() const = 0;
virtual const cmServerResponse Process(const cmServerRequest& request) = 0; virtual cmServerResponse Process(const cmServerRequest& request) = 0;
bool Activate(cmServer* server, const cmServerRequest& request, bool Activate(cmServer* server, const cmServerRequest& request,
std::string* errorMessage); std::string* errorMessage);
@@ -106,7 +106,7 @@ class cmServerProtocol1 : public cmServerProtocol
public: public:
std::pair<int, int> ProtocolVersion() const override; std::pair<int, int> ProtocolVersion() const override;
bool IsExperimental() const override; bool IsExperimental() const override;
const cmServerResponse Process(const cmServerRequest& request) override; cmServerResponse Process(const cmServerRequest& request) override;
private: private:
bool DoActivate(const cmServerRequest& request, bool DoActivate(const cmServerRequest& request,

View File

@@ -31,7 +31,7 @@ public:
operator cmGeneratorTarget const*() const { return this->Target; } operator cmGeneratorTarget const*() const { return this->Target; }
cmGeneratorTarget const* operator->() const { return this->Target; } cmGeneratorTarget const* operator->() const { return this->Target; }
cmGeneratorTarget const& operator*() const { return *this->Target; } cmGeneratorTarget const& operator*() const { return *this->Target; }
friend bool operator<(cmTargetDepend l, cmTargetDepend r) friend bool operator<(cmTargetDepend const& l, cmTargetDepend const& r)
{ {
return l.Target < r.Target; return l.Target < r.Target;
} }

View File

@@ -619,7 +619,7 @@ void cmake::LoadEnvironmentPresets()
this->EnvironmentGenerator = envGenVar; this->EnvironmentGenerator = envGenVar;
} }
auto readGeneratorVar = [&](std::string name, std::string& key) { auto readGeneratorVar = [&](std::string const& name, std::string& key) {
std::string varValue; std::string varValue;
if (cmSystemTools::GetEnv(name, varValue)) { if (cmSystemTools::GetEnv(name, varValue)) {
if (hasEnvironmentGenerator) { if (hasEnvironmentGenerator) {