Commit c1b96fdd authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'remove-cmobject-uses'

2214011f Make cmCPackGenerator not inherit from cmObject
7f9a8d53 Make cmCPackGeneratorFactory not inherit from cmObject
fb0b087c Make cmCTestGenericHandler not inherit from cmObject
2169b0fa Make cmCPackLog not inherit from cmObject
9855ebf1 Make cmCommand not inherit from cmObject
parents b899c0a9 2214011f
......@@ -23,7 +23,7 @@ class cmCPackComponent;
class cmCPackArchiveGenerator : public cmCPackGenerator
{
public:
cmTypeMacro(cmCPackArchiveGenerator, cmCPackGenerator);
typedef cmCPackGenerator Superclass;
/**
* Construct generator
......
......@@ -20,7 +20,8 @@ class cmInstalledFile;
class cmMakefile;
#define cmCPackTypeMacro(klass, superclass) \
cmTypeMacro(klass, superclass); \
typedef superclass Superclass; \
const char* GetNameOfClass() CM_OVERRIDE { return #klass; } \
static cmCPackGenerator* CreateGenerator() { return new klass; } \
class cmCPackTypeMacro_UseTrailingSemicolon
......@@ -36,10 +37,10 @@ class cmMakefile;
* \brief A superclass of all CPack Generators
*
*/
class cmCPackGenerator : public cmObject
class cmCPackGenerator
{
public:
cmTypeMacro(cmCPackGenerator, cmObject);
virtual const char* GetNameOfClass() = 0;
/**
* If verbose then more information is printed out
*/
......@@ -83,7 +84,7 @@ public:
* Construct generator
*/
cmCPackGenerator();
~cmCPackGenerator() CM_OVERRIDE;
virtual ~cmCPackGenerator();
//! Set and get the options
void SetOption(const std::string& op, const char* value);
......
......@@ -19,13 +19,11 @@ class cmCPackLog;
* \brief A container for CPack generators
*
*/
class cmCPackGeneratorFactory : public cmObject
class cmCPackGeneratorFactory
{
public:
cmTypeMacro(cmCPackGeneratorFactory, cmObject);
cmCPackGeneratorFactory();
~cmCPackGeneratorFactory() CM_OVERRIDE;
~cmCPackGeneratorFactory();
//! Get the generator
cmCPackGenerator* NewGenerator(const std::string& name);
......
......@@ -23,13 +23,11 @@
* \brief A container for CPack generators
*
*/
class cmCPackLog : public cmObject
class cmCPackLog
{
public:
cmTypeMacro(cmCPackLog, cmObject);
cmCPackLog();
~cmCPackLog() CM_OVERRIDE;
~cmCPackLog();
enum __log_tags
{
......
......@@ -22,7 +22,7 @@ class cmake;
class cmCTestBuildAndTestHandler : public cmCTestGenericHandler
{
public:
cmTypeMacro(cmCTestBuildAndTestHandler, cmCTestGenericHandler);
typedef cmCTestGenericHandler Superclass;
/*
* The main entry point for this class
......
......@@ -47,8 +47,6 @@ public:
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) CM_OVERRIDE;
cmTypeMacro(cmCTestBuildCommand, cmCTestHandlerCommand);
cmGlobalGenerator* GlobalGenerator;
protected:
......
......@@ -25,7 +25,7 @@ class cmXMLWriter;
class cmCTestBuildHandler : public cmCTestGenericHandler
{
public:
cmTypeMacro(cmCTestBuildHandler, cmCTestGenericHandler);
typedef cmCTestGenericHandler Superclass;
/*
* The main entry point for this class
......
......@@ -26,8 +26,6 @@ public:
cmCTest* CTest;
cmCTestScriptHandler* CTestScriptHandler;
cmTypeMacro(cmCTestCommand, cmCommand);
};
#endif
......@@ -39,8 +39,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "ctest_configure"; }
cmTypeMacro(cmCTestConfigureCommand, cmCTestHandlerCommand);
protected:
cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE;
......
......@@ -15,7 +15,7 @@
class cmCTestConfigureHandler : public cmCTestGenericHandler
{
public:
cmTypeMacro(cmCTestConfigureHandler, cmCTestGenericHandler);
typedef cmCTestGenericHandler Superclass;
/*
* The main entry point for this class
......
......@@ -40,7 +40,7 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "ctest_coverage"; }
cmTypeMacro(cmCTestCoverageCommand, cmCTestHandlerCommand);
typedef cmCTestHandlerCommand Superclass;
protected:
cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE;
......
......@@ -38,7 +38,7 @@ public:
class cmCTestCoverageHandler : public cmCTestGenericHandler
{
public:
cmTypeMacro(cmCTestCoverageHandler, cmCTestGenericHandler);
typedef cmCTestGenericHandler Superclass;
/*
* The main entry point for this class
......
......@@ -51,8 +51,6 @@ public:
{
return "ctest_empty_binary_directory";
}
cmTypeMacro(cmCTestEmptyBinaryDirectoryCommand, cmCTestCommand);
};
#endif
......@@ -22,7 +22,7 @@ class cmMakefile;
* \brief A superclass of all CTest Handlers
*
*/
class cmCTestGenericHandler : public cmObject
class cmCTestGenericHandler
{
public:
/**
......@@ -70,7 +70,7 @@ public:
* Construct handler
*/
cmCTestGenericHandler();
~cmCTestGenericHandler() CM_OVERRIDE;
virtual ~cmCTestGenericHandler();
typedef std::map<std::string, std::string> t_StringToString;
......
......@@ -32,8 +32,6 @@ public:
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) CM_OVERRIDE;
cmTypeMacro(cmCTestHandlerCommand, cmCTestCommand);
enum
{
ct_NONE,
......
......@@ -39,8 +39,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "ctest_memcheck"; }
cmTypeMacro(cmCTestMemCheckCommand, cmCTestTestCommand);
protected:
cmCTestGenericHandler* InitializeActualHandler() CM_OVERRIDE;
};
......
......@@ -23,7 +23,7 @@ class cmCTestMemCheckHandler : public cmCTestTestHandler
friend class cmCTestRunTest;
public:
cmTypeMacro(cmCTestMemCheckHandler, cmCTestTestHandler);
typedef cmCTestTestHandler Superclass;
void PopulateCustomVectors(cmMakefile* mf) CM_OVERRIDE;
......
......@@ -46,8 +46,6 @@ public:
* The name of the command as specified in CMakeList.txt.
*/
std::string GetName() const CM_OVERRIDE { return "ctest_read_custom_files"; }
cmTypeMacro(cmCTestReadCustomFilesCommand, cmCTestCommand);
};
#endif
......@@ -47,8 +47,6 @@ public:
* The name of the command as specified in CMakeList.txt.
*/
std::string GetName() const CM_OVERRIDE { return "ctest_run_script"; }
cmTypeMacro(cmCTestRunScriptCommand, cmCTestCommand);
};
#endif
......@@ -56,7 +56,7 @@ class cmake;
class cmCTestScriptHandler : public cmCTestGenericHandler
{
public:
cmTypeMacro(cmCTestScriptHandler, cmCTestGenericHandler);
typedef cmCTestGenericHandler Superclass;
/**
* Add a script to run, and if is should run in the current process
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment