diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-10-23 00:59:55 +0200 |
---|---|---|
committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-10-23 00:59:55 +0200 |
commit | fb0b087c4dc65f18aef431e41de3aa9b91e35371 (patch) | |
tree | 86a461e32652d91b6fa4cdb98122efb8ef844bb2 /Source | |
parent | 2169b0faa40a20cd9aae25f9170cca074579a023 (diff) | |
download | cmake-fb0b087c4dc65f18aef431e41de3aa9b91e35371.tar.gz |
Make cmCTestGenericHandler not inherit from cmObject
Diffstat (limited to 'Source')
-rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestBuildHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestConfigureHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestCoverageHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestGenericHandler.h | 4 | ||||
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestScriptHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestSubmitHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestTestHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestUpdateHandler.h | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestUploadHandler.h | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h b/Source/CTest/cmCTestBuildAndTestHandler.h index 8d787eaa16..1d424f3277 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.h +++ b/Source/CTest/cmCTestBuildAndTestHandler.h @@ -22,7 +22,7 @@ class cmake; class cmCTestBuildAndTestHandler : public cmCTestGenericHandler { public: - cmTypeMacro(cmCTestBuildAndTestHandler, cmCTestGenericHandler); + typedef cmCTestGenericHandler Superclass; /* * The main entry point for this class diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index 16563ce1ec..69970d5eb8 100644 --- a/Source/CTest/cmCTestBuildHandler.h +++ b/Source/CTest/cmCTestBuildHandler.h @@ -25,7 +25,7 @@ class cmXMLWriter; class cmCTestBuildHandler : public cmCTestGenericHandler { public: - cmTypeMacro(cmCTestBuildHandler, cmCTestGenericHandler); + typedef cmCTestGenericHandler Superclass; /* * The main entry point for this class diff --git a/Source/CTest/cmCTestConfigureHandler.h b/Source/CTest/cmCTestConfigureHandler.h index 913e5c972e..4a7c74b937 100644 --- a/Source/CTest/cmCTestConfigureHandler.h +++ b/Source/CTest/cmCTestConfigureHandler.h @@ -15,7 +15,7 @@ class cmCTestConfigureHandler : public cmCTestGenericHandler { public: - cmTypeMacro(cmCTestConfigureHandler, cmCTestGenericHandler); + typedef cmCTestGenericHandler Superclass; /* * The main entry point for this class diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h index 062f971794..0ba4a7a417 100644 --- a/Source/CTest/cmCTestCoverageHandler.h +++ b/Source/CTest/cmCTestCoverageHandler.h @@ -38,7 +38,7 @@ public: class cmCTestCoverageHandler : public cmCTestGenericHandler { public: - cmTypeMacro(cmCTestCoverageHandler, cmCTestGenericHandler); + typedef cmCTestGenericHandler Superclass; /* * The main entry point for this class diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h index b2ab1d2b5a..ef9fdc02dd 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -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; diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index 8d678af83a..2300f683e0 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -23,7 +23,7 @@ class cmCTestMemCheckHandler : public cmCTestTestHandler friend class cmCTestRunTest; public: - cmTypeMacro(cmCTestMemCheckHandler, cmCTestTestHandler); + typedef cmCTestTestHandler Superclass; void PopulateCustomVectors(cmMakefile* mf) CM_OVERRIDE; diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h index 2bace58b28..5ba8ecf257 100644 --- a/Source/CTest/cmCTestScriptHandler.h +++ b/Source/CTest/cmCTestScriptHandler.h @@ -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 diff --git a/Source/CTest/cmCTestSubmitHandler.h b/Source/CTest/cmCTestSubmitHandler.h index abe4fa2670..6e57de8564 100644 --- a/Source/CTest/cmCTestSubmitHandler.h +++ b/Source/CTest/cmCTestSubmitHandler.h @@ -23,7 +23,7 @@ class cmCTestSubmitHandler : public cmCTestGenericHandler { public: - cmTypeMacro(cmCTestSubmitHandler, cmCTestGenericHandler); + typedef cmCTestGenericHandler Superclass; cmCTestSubmitHandler(); ~cmCTestSubmitHandler() CM_OVERRIDE { this->LogFile = CM_NULLPTR; } diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index 73b3174026..703707f77c 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -32,7 +32,7 @@ class cmCTestTestHandler : public cmCTestGenericHandler friend class cmCTestBatchTestHandler; public: - cmTypeMacro(cmCTestTestHandler, cmCTestGenericHandler); + typedef cmCTestGenericHandler Superclass; /** * The main entry point for this class diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h index c9a8682cc2..9a3ec1bbe0 100644 --- a/Source/CTest/cmCTestUpdateHandler.h +++ b/Source/CTest/cmCTestUpdateHandler.h @@ -19,7 +19,7 @@ class cmCTestUpdateHandler : public cmCTestGenericHandler { public: - cmTypeMacro(cmCTestUpdateHandler, cmCTestGenericHandler); + typedef cmCTestGenericHandler Superclass; /* * The main entry point for this class diff --git a/Source/CTest/cmCTestUploadHandler.h b/Source/CTest/cmCTestUploadHandler.h index 251cd3ea70..eb05a86507 100644 --- a/Source/CTest/cmCTestUploadHandler.h +++ b/Source/CTest/cmCTestUploadHandler.h @@ -18,7 +18,7 @@ class cmCTestUploadHandler : public cmCTestGenericHandler { public: - cmTypeMacro(cmCTestUploadHandler, cmCTestGenericHandler); + typedef cmCTestGenericHandler Superclass; cmCTestUploadHandler(); ~cmCTestUploadHandler() CM_OVERRIDE {} |