ENH: Several cleanups and improvements

1 files changed, 3 insertions, 12 deletions

diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 9df0b80..adb8d9b 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -24,12 +24,7 @@
 #include <time.h>
 
 class cmMakefile;
-class cmCTestBuildHandler;
-class cmCTestConfigureHandler;
-class cmCTestCoverageHandler;
-class cmCTestScriptHandler;
-class cmCTestTestHandler;
-class cmCTestUpdateHandler;
+class cmCTestGenericHandler;
 class cmGeneratedFileStream;
 
 class cmCTest
@@ -194,12 +189,8 @@ public:
 
 private:
   // these are helper classes
-  cmCTestBuildHandler     *BuildHandler;
-  cmCTestCoverageHandler  *CoverageHandler;
-  cmCTestScriptHandler    *ScriptHandler;
-  cmCTestTestHandler      *TestHandler;
-  cmCTestUpdateHandler    *UpdateHandler;
-  cmCTestConfigureHandler *ConfigureHandler;
+  typedef std::map<cmStdString,cmCTestGenericHandler*> t_TestingHandlers;
+  t_TestingHandlers m_TestingHandlers;
   
   bool m_ShowOnly;