From c98ed10d0fbb785d48c5de2faadb81442fa925bc Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Wed, 30 Oct 2024 23:01:36 +0100 Subject: [PATCH] cmCTest*Command: Declare member functions const --- Source/CTest/cmCTestBuildCommand.cxx | 4 ++-- Source/CTest/cmCTestBuildCommand.h | 4 ++-- Source/CTest/cmCTestConfigureCommand.cxx | 2 +- Source/CTest/cmCTestConfigureCommand.h | 2 +- Source/CTest/cmCTestCoverageCommand.cxx | 2 +- Source/CTest/cmCTestCoverageCommand.h | 2 +- Source/CTest/cmCTestHandlerCommand.cxx | 13 +++++++------ Source/CTest/cmCTestHandlerCommand.h | 13 +++++++------ Source/CTest/cmCTestMemCheckCommand.cxx | 6 +++--- Source/CTest/cmCTestMemCheckCommand.h | 4 ++-- Source/CTest/cmCTestSubmitCommand.cxx | 6 +++--- Source/CTest/cmCTestSubmitCommand.h | 6 +++--- Source/CTest/cmCTestTestCommand.cxx | 4 ++-- Source/CTest/cmCTestTestCommand.h | 4 ++-- Source/CTest/cmCTestUpdateCommand.cxx | 2 +- Source/CTest/cmCTestUpdateCommand.h | 2 +- Source/CTest/cmCTestUploadCommand.cxx | 4 ++-- Source/CTest/cmCTestUploadCommand.h | 4 ++-- 18 files changed, 43 insertions(+), 41 deletions(-) diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 160f3d6122..8e2bea460c 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -48,7 +48,7 @@ bool cmCTestBuildCommand::InitialPass(std::vector const& args, } std::unique_ptr cmCTestBuildCommand::InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) + HandlerArguments& arguments, cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto const& args = static_cast(arguments); @@ -137,7 +137,7 @@ std::unique_ptr cmCTestBuildCommand::InitializeHandler( void cmCTestBuildCommand::ProcessAdditionalValues( cmCTestGenericHandler* generic, HandlerArguments const& arguments, - cmExecutionStatus& status) + cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto const& args = static_cast(arguments); diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h index 23eb48a8f5..f8da407300 100644 --- a/Source/CTest/cmCTestBuildCommand.h +++ b/Source/CTest/cmCTestBuildCommand.h @@ -37,11 +37,11 @@ private: std::string GetName() const override { return "ctest_build"; } std::unique_ptr InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) override; + HandlerArguments& arguments, cmExecutionStatus& status) const override; void ProcessAdditionalValues(cmCTestGenericHandler* handler, HandlerArguments const& arguments, - cmExecutionStatus& status) override; + cmExecutionStatus& status) const override; bool InitialPass(std::vector const& args, cmExecutionStatus& status) override; diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx index b4fc1edae2..87becab777 100644 --- a/Source/CTest/cmCTestConfigureCommand.cxx +++ b/Source/CTest/cmCTestConfigureCommand.cxx @@ -33,7 +33,7 @@ std::unique_ptr cmCTestConfigureCommand::Clone() std::unique_ptr cmCTestConfigureCommand::InitializeHandler(HandlerArguments& arguments, - cmExecutionStatus& status) + cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto const& args = static_cast(arguments); diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h index eae5d8caf8..b973703a00 100644 --- a/Source/CTest/cmCTestConfigureCommand.h +++ b/Source/CTest/cmCTestConfigureCommand.h @@ -31,7 +31,7 @@ private: std::string GetName() const override { return "ctest_configure"; } std::unique_ptr InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) override; + HandlerArguments& arguments, cmExecutionStatus& status) const override; bool InitialPass(std::vector const& args, cmExecutionStatus& status) override; diff --git a/Source/CTest/cmCTestCoverageCommand.cxx b/Source/CTest/cmCTestCoverageCommand.cxx index 5443b12d8c..39f4eb9842 100644 --- a/Source/CTest/cmCTestCoverageCommand.cxx +++ b/Source/CTest/cmCTestCoverageCommand.cxx @@ -26,7 +26,7 @@ std::unique_ptr cmCTestCoverageCommand::Clone() std::unique_ptr cmCTestCoverageCommand::InitializeHandler(HandlerArguments& arguments, - cmExecutionStatus& status) + cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto& args = static_cast(arguments); diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h index d3ad3acdca..63a3b10cd9 100644 --- a/Source/CTest/cmCTestCoverageCommand.h +++ b/Source/CTest/cmCTestCoverageCommand.h @@ -34,7 +34,7 @@ private: std::string GetName() const override { return "ctest_coverage"; } std::unique_ptr InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) override; + HandlerArguments& arguments, cmExecutionStatus& status) const override; bool InitialPass(std::vector const& args, cmExecutionStatus& status) override; diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index f8eb238af2..68476720c4 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -71,7 +71,7 @@ private: bool cmCTestHandlerCommand::InvokeImpl( BasicArguments& args, std::vector const& unparsed, - cmExecutionStatus& status, std::function handler) + cmExecutionStatus& status, std::function handler) const { // save error state and restore it if needed SaveRestoreErrorState errorState; @@ -116,8 +116,8 @@ bool cmCTestHandlerCommand::InvokeImpl( return true; } -bool cmCTestHandlerCommand::ExecuteHandlerCommand(HandlerArguments& args, - cmExecutionStatus& status) +bool cmCTestHandlerCommand::ExecuteHandlerCommand( + HandlerArguments& args, cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); @@ -200,18 +200,19 @@ bool cmCTestHandlerCommand::ExecuteHandlerCommand(HandlerArguments& args, } void cmCTestHandlerCommand::CheckArguments(HandlerArguments&, - cmExecutionStatus&) + cmExecutionStatus&) const { } std::unique_ptr -cmCTestHandlerCommand::InitializeHandler(HandlerArguments&, cmExecutionStatus&) +cmCTestHandlerCommand::InitializeHandler(HandlerArguments&, + cmExecutionStatus&) const { return nullptr; }; void cmCTestHandlerCommand::ProcessAdditionalValues(cmCTestGenericHandler*, HandlerArguments const&, - cmExecutionStatus&) + cmExecutionStatus&) const { } diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h index fcf9c07bad..c0a2fbcea9 100644 --- a/Source/CTest/cmCTestHandlerCommand.h +++ b/Source/CTest/cmCTestHandlerCommand.h @@ -67,7 +67,7 @@ protected: template bool Invoke(cmArgumentParser const& parser, std::vector const& arguments, - cmExecutionStatus& status, Handler handler) + cmExecutionStatus& status, Handler handler) const { std::vector unparsed; Args args = parser.Parse(arguments, &unparsed); @@ -76,22 +76,23 @@ protected: }; bool ExecuteHandlerCommand(HandlerArguments& args, - cmExecutionStatus& status); + cmExecutionStatus& status) const; private: bool InvokeImpl(BasicArguments& args, std::vector const& unparsed, - cmExecutionStatus& status, std::function handler); + cmExecutionStatus& status, + std::function handler) const; virtual std::string GetName() const = 0; virtual void CheckArguments(HandlerArguments& arguments, - cmExecutionStatus& status); + cmExecutionStatus& status) const; virtual std::unique_ptr InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status); + HandlerArguments& arguments, cmExecutionStatus& status) const; virtual void ProcessAdditionalValues(cmCTestGenericHandler*, HandlerArguments const& arguments, - cmExecutionStatus& status); + cmExecutionStatus& status) const; }; diff --git a/Source/CTest/cmCTestMemCheckCommand.cxx b/Source/CTest/cmCTestMemCheckCommand.cxx index bf8d046bc0..165ad47b4f 100644 --- a/Source/CTest/cmCTestMemCheckCommand.cxx +++ b/Source/CTest/cmCTestMemCheckCommand.cxx @@ -23,8 +23,8 @@ std::unique_ptr cmCTestMemCheckCommand::Clone() } std::unique_ptr -cmCTestMemCheckCommand::InitializeActualHandler(HandlerArguments& args, - cmExecutionStatus& status) +cmCTestMemCheckCommand::InitializeActualHandler( + HandlerArguments& args, cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto handler = cm::make_unique(this->CTest); @@ -49,7 +49,7 @@ cmCTestMemCheckCommand::InitializeActualHandler(HandlerArguments& args, void cmCTestMemCheckCommand::ProcessAdditionalValues( cmCTestGenericHandler* handler, HandlerArguments const& arguments, - cmExecutionStatus& status) + cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto const& args = static_cast(arguments); diff --git a/Source/CTest/cmCTestMemCheckCommand.h b/Source/CTest/cmCTestMemCheckCommand.h index 4993403b7e..6519486daa 100644 --- a/Source/CTest/cmCTestMemCheckCommand.h +++ b/Source/CTest/cmCTestMemCheckCommand.h @@ -32,11 +32,11 @@ private: std::string GetName() const override { return "ctest_memcheck"; } std::unique_ptr InitializeActualHandler( - HandlerArguments& arguments, cmExecutionStatus& status) override; + HandlerArguments& arguments, cmExecutionStatus& status) const override; void ProcessAdditionalValues(cmCTestGenericHandler* handler, HandlerArguments const& arguments, - cmExecutionStatus& status) override; + cmExecutionStatus& status) const override; bool InitialPass(std::vector const& args, cmExecutionStatus& status) override; diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index 913df58d4e..6f1ede2ff8 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -31,7 +31,7 @@ std::unique_ptr cmCTestSubmitCommand::Clone() } std::unique_ptr cmCTestSubmitCommand::InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) + HandlerArguments& arguments, cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto const& args = static_cast(arguments); @@ -208,7 +208,7 @@ bool cmCTestSubmitCommand::InitialPass(std::vector const& args, } void cmCTestSubmitCommand::CheckArguments(HandlerArguments& arguments, - cmExecutionStatus& status) + cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto& args = static_cast(arguments); @@ -241,7 +241,7 @@ void cmCTestSubmitCommand::CheckArguments(HandlerArguments& arguments, void cmCTestSubmitCommand::ProcessAdditionalValues( cmCTestGenericHandler*, HandlerArguments const& arguments, - cmExecutionStatus& status) + cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto const& args = static_cast(arguments); diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h index 92bca91abc..2cd747cbbd 100644 --- a/Source/CTest/cmCTestSubmitCommand.h +++ b/Source/CTest/cmCTestSubmitCommand.h @@ -46,14 +46,14 @@ private: std::string GetName() const override { return "ctest_submit"; } void CheckArguments(HandlerArguments& arguments, - cmExecutionStatus& status) override; + cmExecutionStatus& status) const override; std::unique_ptr InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) override; + HandlerArguments& arguments, cmExecutionStatus& status) const override; void ProcessAdditionalValues(cmCTestGenericHandler* handler, HandlerArguments const& arguments, - cmExecutionStatus& status) override; + cmExecutionStatus& status) const override; bool InitialPass(std::vector const& args, cmExecutionStatus& status) override; diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx index cdfca9beb5..f25d227680 100644 --- a/Source/CTest/cmCTestTestCommand.cxx +++ b/Source/CTest/cmCTestTestCommand.cxx @@ -29,7 +29,7 @@ std::unique_ptr cmCTestTestCommand::Clone() } std::unique_ptr cmCTestTestCommand::InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) + HandlerArguments& arguments, cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto& args = static_cast(arguments); @@ -148,7 +148,7 @@ std::unique_ptr cmCTestTestCommand::InitializeHandler( std::unique_ptr cmCTestTestCommand::InitializeActualHandler(HandlerArguments&, - cmExecutionStatus&) + cmExecutionStatus&) const { return cm::make_unique(this->CTest); } diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h index 25cb49f2fa..667d2437a0 100644 --- a/Source/CTest/cmCTestTestCommand.h +++ b/Source/CTest/cmCTestTestCommand.h @@ -84,10 +84,10 @@ private: std::string GetName() const override { return "ctest_test"; } virtual std::unique_ptr InitializeActualHandler( - HandlerArguments& arguments, cmExecutionStatus& status); + HandlerArguments& arguments, cmExecutionStatus& status) const; std::unique_ptr InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) override; + HandlerArguments& arguments, cmExecutionStatus& status) const override; bool InitialPass(std::vector const& args, cmExecutionStatus& status) override; diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx index 7874e4261e..ae521a776a 100644 --- a/Source/CTest/cmCTestUpdateCommand.cxx +++ b/Source/CTest/cmCTestUpdateCommand.cxx @@ -22,7 +22,7 @@ std::unique_ptr cmCTestUpdateCommand::Clone() } std::unique_ptr cmCTestUpdateCommand::InitializeHandler( - HandlerArguments& args, cmExecutionStatus& status) + HandlerArguments& args, cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); if (!args.Source.empty()) { diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h index d0604aec48..95a1a18541 100644 --- a/Source/CTest/cmCTestUpdateCommand.h +++ b/Source/CTest/cmCTestUpdateCommand.h @@ -25,7 +25,7 @@ private: std::string GetName() const override { return "ctest_update"; } std::unique_ptr InitializeHandler( - HandlerArguments& args, cmExecutionStatus& status) override; + HandlerArguments& args, cmExecutionStatus& status) const override; bool InitialPass(std::vector const& args, cmExecutionStatus& status) override; diff --git a/Source/CTest/cmCTestUploadCommand.cxx b/Source/CTest/cmCTestUploadCommand.cxx index 4504b58671..d77363932f 100644 --- a/Source/CTest/cmCTestUploadCommand.cxx +++ b/Source/CTest/cmCTestUploadCommand.cxx @@ -27,7 +27,7 @@ std::unique_ptr cmCTestUploadCommand::Clone() } void cmCTestUploadCommand::CheckArguments(HandlerArguments& arguments, - cmExecutionStatus& status) + cmExecutionStatus& status) const { cmMakefile& mf = status.GetMakefile(); auto& args = static_cast(arguments); @@ -44,7 +44,7 @@ void cmCTestUploadCommand::CheckArguments(HandlerArguments& arguments, } std::unique_ptr cmCTestUploadCommand::InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus&) + HandlerArguments& arguments, cmExecutionStatus&) const { auto const& args = static_cast(arguments); auto handler = cm::make_unique(this->CTest); diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h index fffd90f143..d2a7320d35 100644 --- a/Source/CTest/cmCTestUploadCommand.h +++ b/Source/CTest/cmCTestUploadCommand.h @@ -32,10 +32,10 @@ private: std::string GetName() const override { return "ctest_upload"; } void CheckArguments(HandlerArguments& arguments, - cmExecutionStatus& status) override; + cmExecutionStatus& status) const override; std::unique_ptr InitializeHandler( - HandlerArguments& arguments, cmExecutionStatus& status) override; + HandlerArguments& arguments, cmExecutionStatus& status) const override; bool InitialPass(std::vector const& args, cmExecutionStatus& status) override;