From 62decc533b03966c7584fae9b53f4e888bb711bf Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 5 Nov 2007 16:33:19 -0500 Subject: [PATCH] ENH: change name of class --- Source/CMakeLists.txt | 2 +- ...kGenerators.cxx => cmCPackGeneratorFactory.cxx} | 14 +++++++------- ...CPackGenerators.h => cmCPackGeneratorFactory.h} | 14 +++++++------- Source/CPack/cpack.cxx | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) rename Source/CPack/{cmCPackGenerators.cxx => cmCPackGeneratorFactory.cxx} (90%) rename Source/CPack/{cmCPackGenerators.h => cmCPackGeneratorFactory.h} (86%) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 56487cff7..c67fe3e6f 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -307,7 +307,7 @@ TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_L # Sources for CPack # SET(CPACK_SRCS - CPack/cmCPackGenerators.cxx + CPack/cmCPackGeneratorFactory.cxx CPack/cmCPackGenericGenerator.cxx CPack/cmCPackLog.cxx CPack/cmCPackNSISGenerator.cxx diff --git a/Source/CPack/cmCPackGenerators.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx similarity index 90% rename from Source/CPack/cmCPackGenerators.cxx rename to Source/CPack/cmCPackGeneratorFactory.cxx index d9f3301fe..a15217bef 100644 --- a/Source/CPack/cmCPackGenerators.cxx +++ b/Source/CPack/cmCPackGeneratorFactory.cxx @@ -15,7 +15,7 @@ =========================================================================*/ -#include "cmCPackGenerators.h" +#include "cmCPackGeneratorFactory.h" #include "cmCPackGenericGenerator.h" #include "cmCPackTGZGenerator.h" @@ -44,7 +44,7 @@ #include "cmCPackLog.h" //---------------------------------------------------------------------- -cmCPackGenerators::cmCPackGenerators() +cmCPackGeneratorFactory::cmCPackGeneratorFactory() { this->RegisterGenerator("TGZ", "Tar GZip compression", cmCPackTGZGenerator::CreateGenerator); @@ -81,7 +81,7 @@ cmCPackGenerators::cmCPackGenerators() } //---------------------------------------------------------------------- -cmCPackGenerators::~cmCPackGenerators() +cmCPackGeneratorFactory::~cmCPackGeneratorFactory() { std::vector::iterator it; for ( it = this->Generators.begin(); it != this->Generators.end(); ++ it ) @@ -91,7 +91,7 @@ cmCPackGenerators::~cmCPackGenerators() } //---------------------------------------------------------------------- -cmCPackGenericGenerator* cmCPackGenerators::NewGenerator(const char* name) +cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name) { cmCPackGenericGenerator* gen = this->NewGeneratorInternal(name); if ( !gen ) @@ -104,14 +104,14 @@ cmCPackGenericGenerator* cmCPackGenerators::NewGenerator(const char* name) } //---------------------------------------------------------------------- -cmCPackGenericGenerator* cmCPackGenerators::NewGeneratorInternal( +cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGeneratorInternal( const char* name) { if ( !name ) { return 0; } - cmCPackGenerators::t_GeneratorCreatorsMap::iterator it + cmCPackGeneratorFactory::t_GeneratorCreatorsMap::iterator it = this->GeneratorCreators.find(name); if ( it == this->GeneratorCreators.end() ) { @@ -121,7 +121,7 @@ cmCPackGenericGenerator* cmCPackGenerators::NewGeneratorInternal( } //---------------------------------------------------------------------- -void cmCPackGenerators::RegisterGenerator(const char* name, +void cmCPackGeneratorFactory::RegisterGenerator(const char* name, const char* generatorDescription, CreateGeneratorCall* createGenerator) { diff --git a/Source/CPack/cmCPackGenerators.h b/Source/CPack/cmCPackGeneratorFactory.h similarity index 86% rename from Source/CPack/cmCPackGenerators.h rename to Source/CPack/cmCPackGeneratorFactory.h index 76a169785..4dcc55ee4 100644 --- a/Source/CPack/cmCPackGenerators.h +++ b/Source/CPack/cmCPackGeneratorFactory.h @@ -15,25 +15,25 @@ =========================================================================*/ -#ifndef cmCPackGenerators_h -#define cmCPackGenerators_h +#ifndef cmCPackGeneratorFactory_h +#define cmCPackGeneratorFactory_h #include "cmObject.h" class cmCPackLog; class cmCPackGenericGenerator; -/** \class cmCPackGenerators +/** \class cmCPackGeneratorFactory * \brief A container for CPack generators * */ -class cmCPackGenerators : public cmObject +class cmCPackGeneratorFactory : public cmObject { public: - cmTypeMacro(cmCPackGenerators, cmObject); + cmTypeMacro(cmCPackGeneratorFactory, cmObject); - cmCPackGenerators(); - ~cmCPackGenerators(); + cmCPackGeneratorFactory(); + ~cmCPackGeneratorFactory(); //! Get the generator cmCPackGenericGenerator* NewGenerator(const char* name); diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index bb071e9f6..12585e363 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -19,7 +19,7 @@ // Need these for documentation support. #include "cmake.h" #include "cmDocumentation.h" -#include "cmCPackGenerators.h" +#include "cmCPackGeneratorFactory.h" #include "cmCPackGenericGenerator.h" #include "cmake.h" #include "cmGlobalGenerator.h" @@ -232,7 +232,7 @@ int main (int argc, char *argv[]) cpackConfigFileSpecified = false; } - cmCPackGenerators generators; + cmCPackGeneratorFactory generators; generators.SetLogger(&log); cmCPackGenericGenerator* cpackGenerator = 0; @@ -453,7 +453,7 @@ int main (int argc, char *argv[]) doc.SetSection("Options",cmDocumentationOptions); std::vector v; - cmCPackGenerators::DescriptionsMap::const_iterator generatorIt; + cmCPackGeneratorFactory::DescriptionsMap::const_iterator generatorIt; for( generatorIt = generators.GetGeneratorsList().begin(); generatorIt != generators.GetGeneratorsList().end(); ++ generatorIt )