Include/cppunit/ui/text/TestRunner.

include/cppunit/ui/text/TestRunner.h:
* src/cppunit/TextTestRunner.cpp: Renamed TextUi::TestRunner
TextTestRunner and moved it to the CppUnit namespace. Added
a deprecated typedef for compatibility with previous version.

* include/cppunit/ui/text/TextTestRunner.h: added.

* include/cppunit/ui/mfc/TestRunner.h:
* src/cppunit/msvc6/testrunner/TestRunner.cpp: Renamed MfcUi::TestRunner
MfcTestRunner. Added deprecated typedef for compatibility. Renamed
TestRunner.cpp to MfcTestRunner.cpp.

* include/cppunit/ui/mfc/MfcTestRunner.h: added.

* include/cppunit/ui/qt/TestRunner.h:
* src/qttestrunner/TestRunner.cpp: renamed QtUi::TestRunner QtTestRunner
and moved it to CppUnit namespace. Added a deprecated typedef for
compatibility. Renamed TestRunner.cpp to QtTestRunner.cpp.

* include/cppunit/ui/qt/TestRunner.h:
* src/qttestrunner/TestRunner.h: Moved TestRunner to CppUnit namespace
and renamed it QtTestRunner. Added deprecated typedef for compatibility.

* include/cppunit/Asserter.h:
* src/cppunit/Asserter.cpp: changed namespace Asserter to a struct and
made all methods static.

* include/cppunit/extensions/HelperMacros.h:
* include/cppunit/extensions/SourceLine.h:
* include/cppunit/extensions/TestAssert.h:
* include/cppunit/extensions/TestPlugIn.h:
* include/cppunit/Portability.h: changed CPPUNIT_NS(symbol) to a
symbol macro that expand either to CppUnit or nothing. The symbol is
no longer a parameter.

* include/cppunit/portability/CppUnitVector.h:
* include/cppunit/portability/CppUnitDeque.h:
* include/cppunit/portability/CppUnitMap.h: added. STL Wrapper for
compilers that do not support template default argumenent and need
the allocator to be passed when instantiating STL container.

* examples/cppunittest/*.h:
* examples/cppunittest/*.cpp:
* src/msvc6/testrunner/*.h:
* src/msvc6/testrunner/*.cpp:
* src/msvc6/testpluginrunner/*.h:
* src/msvc6/testpluginrunner/*.cpp:
* src/qttestrunner/*.h:
* src/qttestrunner/*.cpp: replaced occurence of CppUnit:: by CPPUNIT_NS.

* src/cppunit/TestSuite.h:
replaced occurence of std::vector by CppUnitVector.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/msvc6/testrunner/TestRunnerModel.cpp b/src/msvc6/testrunner/TestRunnerModel.cpp
index bf0e0b6..a3ea830 100644
--- a/src/msvc6/testrunner/TestRunnerModel.cpp
+++ b/src/msvc6/testrunner/TestRunnerModel.cpp
@@ -16,7 +16,7 @@ const CString TestRunnerModel::settingMainDialogKey( _T( "MainDialog" ) );
 const CString TestRunnerModel::settingBrowseDialogKey( _T( "BrowseDialog" ) );
 
 
-TestRunnerModel::TestRunnerModel( CppUnit::Test *rootTest ) :
+TestRunnerModel::TestRunnerModel( CPPUNIT_NS::Test *rootTest ) :
     m_rootTest( rootTest )
 {
 }
@@ -34,7 +34,7 @@ TestRunnerModel::history() const
 
 
 void 
-TestRunnerModel::selectHistoryTest( CppUnit::Test *test )
+TestRunnerModel::selectHistoryTest( CPPUNIT_NS::Test *test )
 {
   History::iterator end = 
       std::remove( m_history.begin(), m_history.end(), test );
@@ -45,7 +45,7 @@ TestRunnerModel::selectHistoryTest( CppUnit::Test *test )
 }
 
 
-CppUnit::Test *
+CPPUNIT_NS::Test *
 TestRunnerModel::selectedTest() const
 {
   if ( m_history.size() > 0 )
@@ -126,7 +126,7 @@ TestRunnerModel::saveSettings( const Settings & s )
         it != m_history.end(); 
         ++it , ++idx )
   {
-    CppUnit::Test *test = *it;
+    CPPUNIT_NS::Test *test = *it;
     saveHistoryEntry( idx, test->getName().c_str() );
   }
 }
@@ -154,7 +154,7 @@ TestRunnerModel::getHistoryEntryName( int idx ) const
 }
 
 
-CppUnit::Test *
+CPPUNIT_NS::Test *
 TestRunnerModel::rootTest()
 {
   return m_rootTest;
@@ -162,36 +162,36 @@ TestRunnerModel::rootTest()
 
 
 void 
-TestRunnerModel::setRootTest( CppUnit::Test *test )
+TestRunnerModel::setRootTest( CPPUNIT_NS::Test *test )
 {
   m_rootTest = test;
 }
 
 
-CppUnit::Test * 
+CPPUNIT_NS::Test * 
 TestRunnerModel::findTestByName( CString name ) const
 {
   return findTestByNameFor( name, m_rootTest );
 }
 
 
-CppUnit::Test * 
+CPPUNIT_NS::Test * 
 TestRunnerModel::findTestByNameFor( const CString &name, 
-                                    CppUnit::Test *test ) const
+                                    CPPUNIT_NS::Test *test ) const
 {
   if ( name == test->getName().c_str() )
     return test;
 
-  CppUnit::TestSuite *suite = dynamic_cast<CppUnit::TestSuite *>(test);
+  CPPUNIT_NS::TestSuite *suite = dynamic_cast<CPPUNIT_NS::TestSuite *>(test);
   if ( suite == NULL )
     return NULL;
 
-  const std::vector<CppUnit::Test *> &tests = suite->getTests();
-  for ( std::vector<CppUnit::Test *>::const_iterator it = tests.begin(); 
+  const std::vector<CPPUNIT_NS::Test *> &tests = suite->getTests();
+  for ( std::vector<CPPUNIT_NS::Test *>::const_iterator it = tests.begin(); 
         it != tests.end(); 
         ++it )
   {
-    CppUnit::Test *testFound = findTestByNameFor( name, *it );
+    CPPUNIT_NS::Test *testFound = findTestByNameFor( name, *it );
     if ( testFound != NULL )
       return testFound;
   }