From aae0bcdacfb9cfc10769452895fbc96c43add1d6 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Wed, 10 May 2006 13:50:44 -0400 Subject: STYLE: fix line length --- Source/CTest/cmCTestGenericHandler.cxx | 3 ++- Source/CTest/cmCTestHandlerCommand.cxx | 4 ++-- Source/CTest/cmCTestReadCustomFilesCommand.h | 4 ++-- Source/CTest/cmCTestScriptHandler.cxx | 9 ++++++--- Source/CTest/cmCTestTestHandler.cxx | 5 +++-- Source/CTest/cmCTestUpdateCommand.cxx | 3 ++- Source/cmAddExecutableCommand.cxx | 3 ++- Source/cmAddSubDirectoryCommand.cxx | 9 +++++++-- Source/cmAddTestCommand.cxx | 7 +++---- Source/cmAuxSourceDirectoryCommand.cxx | 6 ++++-- 10 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx index 6f0fb72..4ce1d5b 100644 --- a/Source/CTest/cmCTestGenericHandler.cxx +++ b/Source/CTest/cmCTestGenericHandler.cxx @@ -54,7 +54,8 @@ void cmCTestGenericHandler::SetOption(const char* op, const char* value) } //---------------------------------------------------------------------- -void cmCTestGenericHandler::SetPersistentOption(const char* op, const char* value) +void cmCTestGenericHandler::SetPersistentOption(const char* op, + const char* value) { this->SetOption(op, value); if ( !op ) diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index 89420bf..09fd82a 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -38,8 +38,8 @@ cmCTestHandlerCommand::cmCTestHandlerCommand() bool cmCTestHandlerCommand::InitialPass( std::vector const& args) { - if ( !this->ProcessArguments(args, (unsigned int)this->Last, &*this->Arguments.begin(), - this->Values) ) + if ( !this->ProcessArguments(args, (unsigned int)this->Last, + &*this->Arguments.begin(),this->Values) ) { return false; } diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h index 08febdf..cb870af 100644 --- a/Source/CTest/cmCTestReadCustomFilesCommand.h +++ b/Source/CTest/cmCTestReadCustomFilesCommand.h @@ -67,8 +67,8 @@ public: { return " CTEST_READ_CUSTOM_FILES( directory ... )\n" - "Read all the CTestCustom.ctest or CTestCustom.cmake files from the given " - "directory."; + "Read all the CTestCustom.ctest or CTestCustom.cmake files from " + "the given directory."; } cmTypeMacro(cmCTestReadCustomFilesCommand, cmCTestCommand); diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index c65491f..4149e95 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -167,7 +167,8 @@ cmCTestScriptHandler::~cmCTestScriptHandler() //---------------------------------------------------------------------- // just adds an argument to the vector -void cmCTestScriptHandler::AddConfigurationScript(const char *script, bool pscope) +void cmCTestScriptHandler::AddConfigurationScript(const char *script, + bool pscope) { this->ConfigurationScripts.push_back(script); this->ScriptProcessScope.push_back(pscope); @@ -253,7 +254,8 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg) int pipe = cmSystemTools::WaitForLine(cp, line, 100.0, out, err); while(pipe != cmsysProcess_Pipe_None) { - cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Output: " << line << "\n"); + cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Output: " + << line << "\n"); if(pipe == cmsysProcess_Pipe_STDERR) { cmCTestLog(this->CTest, ERROR_MESSAGE, line << "\n"); @@ -927,7 +929,8 @@ void cmCTestScriptHandler::RestoreBackupDirectories() } } -bool cmCTestScriptHandler::RunScript(cmCTest* ctest, const char *sname, bool InProcess) +bool cmCTestScriptHandler::RunScript(cmCTest* ctest, const char *sname, + bool InProcess) { cmCTestScriptHandler* sh = new cmCTestScriptHandler(); sh->SetCTestInstance(ctest); diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 9e2b3b1..1b4968d 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -111,8 +111,9 @@ bool cmCTestSubdirCommand::InitialPass(std::vector const& args) } fname += "/"; fname += testFilename; - bool readit = this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(), - fname.c_str()); + bool readit = + this->Makefile->ReadListFile(this->Makefile->GetCurrentListFile(), + fname.c_str()); cmSystemTools::ChangeDirectory(cwd.c_str()); if(!readit) { diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx index 7d274b8..2c116c0 100644 --- a/Source/CTest/cmCTestUpdateCommand.cxx +++ b/Source/CTest/cmCTestUpdateCommand.cxx @@ -51,7 +51,8 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler() = this->Makefile->GetDefinition("CTEST_CHECKOUT_COMMAND"); if ( !initialCheckoutCommand ) { - initialCheckoutCommand = this->Makefile->GetDefinition("CTEST_CVS_CHECKOUT"); + initialCheckoutCommand = + this->Makefile->GetDefinition("CTEST_CVS_CHECKOUT"); } cmCTestGenericHandler* handler diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx index b440e03..d44fa9a 100644 --- a/Source/cmAddExecutableCommand.cxx +++ b/Source/cmAddExecutableCommand.cxx @@ -51,7 +51,8 @@ bool cmAddExecutableCommand::InitialPass(std::vector const& args) if (s == args.end()) { - this->SetError("called with incorrect number of arguments, no sources provided"); + this->SetError + ("called with incorrect number of arguments, no sources provided"); return false; } diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx index a134c59..e695781 100644 --- a/Source/cmAddSubDirectoryCommand.cxx +++ b/Source/cmAddSubDirectoryCommand.cxx @@ -17,7 +17,8 @@ #include "cmAddSubDirectoryCommand.h" // cmAddSubDirectoryCommand -bool cmAddSubDirectoryCommand::InitialPass(std::vector const& args) +bool cmAddSubDirectoryCommand::InitialPass +(std::vector const& args) { if(args.size() < 1 ) { @@ -103,7 +104,11 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector const& args) if (!cmSystemTools::FindLastString(binPath.c_str(), this->Makefile->GetHomeDirectory())) { - this->SetError("A full source directory was specified that is not in the source tree but no binary directory was specified. If you specify an out of tree source directory then you must provide the binary directory as well."); + this->SetError("A full source directory was specified that is not " + "in the source tree but no binary directory was " + "specified. If you specify an out of tree source " + "directory then you must provide the binary " + "directory as well."); return false; } cmSystemTools::ReplaceString(binPath,this->Makefile->GetHomeDirectory(), diff --git a/Source/cmAddTestCommand.cxx b/Source/cmAddTestCommand.cxx index 00cda18..cf50401 100644 --- a/Source/cmAddTestCommand.cxx +++ b/Source/cmAddTestCommand.cxx @@ -22,10 +22,9 @@ // cmExecutableCommand bool cmAddTestCommand::InitialPass(std::vector const& args) { - // First argument is the name of the test - // Second argument is the name of the executable to run (a target or external - // program) - // Remaining arguments are the arguments to pass to the executable + // First argument is the name of the test Second argument is the name of + // the executable to run (a target or external program) Remaining arguments + // are the arguments to pass to the executable if(args.size() < 2 ) { this->SetError("called with incorrect number of arguments"); diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx index 892ed4a..37dee8c 100644 --- a/Source/cmAuxSourceDirectoryCommand.cxx +++ b/Source/cmAuxSourceDirectoryCommand.cxx @@ -20,7 +20,8 @@ #include // cmAuxSourceDirectoryCommand -bool cmAuxSourceDirectoryCommand::InitialPass(std::vector const& args) +bool cmAuxSourceDirectoryCommand::InitialPass +(std::vector const& args) { if(args.size() < 2 || args.size() > 2) { @@ -68,7 +69,8 @@ bool cmAuxSourceDirectoryCommand::InitialPass(std::vector const& ar // add the file as a class file so // depends can be done cmSourceFile cmfile; - cmfile.SetName(fullname.c_str(), this->Makefile->GetCurrentDirectory(), + cmfile.SetName(fullname.c_str(), + this->Makefile->GetCurrentDirectory(), this->Makefile->GetSourceExtensions(), this->Makefile->GetHeaderExtensions()); cmfile.SetProperty("ABSTRACT","0"); -- cgit v0.12