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, 8 insertions, 8 deletions

diff --git a/examples/cppunittest/TestCallerTest.cpp b/examples/cppunittest/TestCallerTest.cpp
index 626368b..bdfb3d0 100644
--- a/examples/cppunittest/TestCallerTest.cpp
+++ b/examples/cppunittest/TestCallerTest.cpp
@@ -19,7 +19,7 @@ TestCallerTest::ExceptionThrower::testThrowFailureException()
 void 
 TestCallerTest::ExceptionThrower::testThrowException()
 {
-  throw CppUnit::Exception( CppUnit::Message( "expected Exception" ) );
+  throw CPPUNIT_NS::Exception( CPPUNIT_NS::Message( "expected Exception" ) );
 }
 
 
@@ -51,7 +51,7 @@ TestCallerTest::setUp()
   m_testCount = 0;
   TrackedTestCase::setTracker( this );
   m_testListener = new MockTestListener( "listener1" );
-  m_result = new CppUnit::TestResult();
+  m_result = new CPPUNIT_NS::TestResult();
   m_result->addListener( m_testListener );
 }
 
@@ -104,7 +104,7 @@ void
 TestCallerTest::testBasicConstructor()
 {
   {
-    CppUnit::TestCaller<TrackedTestCase> caller( m_testName, 
+    CPPUNIT_NS::TestCaller<TrackedTestCase> caller( m_testName, 
                                                  &TrackedTestCase::test );
     checkTestName( caller.getName() );
     checkNothingButConstructorCalled();
@@ -122,7 +122,7 @@ TestCallerTest::testReferenceConstructor()
 {
   TrackedTestCase testCase;
   {
-    CppUnit::TestCaller<TrackedTestCase> caller( "TrackedTestCaseCaller", 
+    CPPUNIT_NS::TestCaller<TrackedTestCase> caller( "TrackedTestCaseCaller", 
                                                  &TrackedTestCase::test, 
                                                  testCase );
     checkTestName( caller.getName() );
@@ -141,7 +141,7 @@ TestCallerTest::testPointerConstructor()
 {
   TrackedTestCase *testCase = new TrackedTestCase();
   {
-    CppUnit::TestCaller<TrackedTestCase> caller( m_testName, 
+    CPPUNIT_NS::TestCaller<TrackedTestCase> caller( m_testName, 
                                                  &TrackedTestCase::test, 
                                                  testCase );
     checkTestName( caller.getName() );
@@ -158,7 +158,7 @@ TestCallerTest::testPointerConstructor()
 void 
 TestCallerTest::testExpectFailureException()
 {
-  CppUnit::TestCaller<ExceptionThrower,FailureException> caller( 
+  CPPUNIT_NS::TestCaller<ExceptionThrower,FailureException> caller( 
       m_testName,
       &ExceptionThrower::testThrowFailureException );
   m_testListener->setExpectNoFailure();
@@ -170,7 +170,7 @@ TestCallerTest::testExpectFailureException()
 void 
 TestCallerTest::testExpectException()
 {
-  CppUnit::TestCaller<ExceptionThrower,CppUnit::Exception> caller( 
+  CPPUNIT_NS::TestCaller<ExceptionThrower,CPPUNIT_NS::Exception> caller( 
       m_testName,
       &ExceptionThrower::testThrowException );
   m_testListener->setExpectNoFailure();
@@ -182,7 +182,7 @@ TestCallerTest::testExpectException()
 void 
 TestCallerTest::testExpectedExceptionNotCaught()
 {
-  CppUnit::TestCaller<ExceptionThrower,FailureException> caller( 
+  CPPUNIT_NS::TestCaller<ExceptionThrower,FailureException> caller( 
       m_testName,
       &ExceptionThrower::testThrowNothing );
   m_testListener->setExpectedAddFailureCall( 1 );