CodingGuideLines.

CodingGuideLines.txt: added. CppUnit's coding guidelines for portability.

* include/cppunit/portability/CppUnitStack.h: added. wrapper for std::stack.

* include/cppunit/portability/CppUnitSet.h: added. wrapper for std::set.

* include/cppunit/ui/text/TestRunner.h: fixed namespace definition for
deprecated TestRunner.

* include/cppunit/TestAssert.h:
* src/cppunit/TestAssert.cpp: removed old deprecated functions that did
not use SourceLine. Moved assertEquals() and assertDoubleEquals() into
CppUnit namespace.

* src/cppunit/TestFactoryRegistry.cpp: use CppUnitMap instead of std::map.

* src/DllPlugInTester/CommandLineParser.h: use CppUnitDeque instead
std::deque.

* examples/cppunittest/*.h:
* examples/cppunittest/*.cpp: removed all usage of CppUnitTest namespace.
Everything is now in global space.

* examples/*/*.h:
* examples/*/*.cpp: replaced usage of CppUnit:: with CPPUNIT_NS::.

* examples/ClockerPlugIn/ClockerModel.h: use CppUnit STL wrapper instead
of STL container.

53 files changed, 167 insertions, 213 deletions

diff --git a/examples/ClockerPlugIn/ClockerListener.cpp b/examples/ClockerPlugIn/ClockerListener.cpp
index a93cd38..643a947 100644
--- a/examples/ClockerPlugIn/ClockerListener.cpp
+++ b/examples/ClockerPlugIn/ClockerListener.cpp
@@ -24,16 +24,16 @@ ClockerListener::~ClockerListener()
 
 
 void 
-ClockerListener::startTestRun( CppUnit::Test *test, 
-                               CppUnit::TestResult *eventManager )
+ClockerListener::startTestRun( CPPUNIT_NS::Test *test, 
+                               CPPUNIT_NS::TestResult *eventManager )
 {
   m_model->setExpectedTestCount( test->countTestCases() *2 );
 }
 
 
 void 
-ClockerListener::endTestRun( CppUnit::Test *test, 
-                             CppUnit::TestResult *eventManager )
+ClockerListener::endTestRun( CPPUNIT_NS::Test *test, 
+                             CPPUNIT_NS::TestResult *eventManager )
 {
   if ( m_text )
     printStatistics();
@@ -41,28 +41,28 @@ ClockerListener::endTestRun( CppUnit::Test *test,
 
 
 void 
-ClockerListener::startTest( CppUnit::Test *test )
+ClockerListener::startTest( CPPUNIT_NS::Test *test )
 {
   m_model->enterTest( test, false );
 }
 
 
 void 
-ClockerListener::endTest( CppUnit::Test *test )
+ClockerListener::endTest( CPPUNIT_NS::Test *test )
 {
   m_model->exitTest( test, false );
 }
 
 
 void 
-ClockerListener::startSuite( CppUnit::Test *suite )
+ClockerListener::startSuite( CPPUNIT_NS::Test *suite )
 {
   m_model->enterTest( suite, true );
 }
 
 
 void 
-ClockerListener::endSuite( CppUnit::Test *suite )
+ClockerListener::endSuite( CPPUNIT_NS::Test *suite )
 {
   m_model->exitTest( suite, true );
 }
diff --git a/examples/ClockerPlugIn/ClockerListener.h b/examples/ClockerPlugIn/ClockerListener.h
index e3c84e4..17d85d4 100644
--- a/examples/ClockerPlugIn/ClockerListener.h
+++ b/examples/ClockerPlugIn/ClockerListener.h
@@ -12,7 +12,7 @@ class ClockerModel;
 
 
 /// TestListener that prints a flatten or hierarchical view of the test tree.
-class ClockerListener : public CppUnit::TestListener
+class ClockerListener : public CPPUNIT_NS::TestListener
 {
 public:
   ClockerListener( ClockerModel *model,
@@ -20,19 +20,19 @@ public:
 
   virtual ~ClockerListener();
 
-  void startTestRun( CppUnit::Test *test, 
-                     CppUnit::TestResult *eventManager );
+  void startTestRun( CPPUNIT_NS::Test *test, 
+                     CPPUNIT_NS::TestResult *eventManager );
 
-  void endTestRun( CppUnit::Test *test, 
-                   CppUnit::TestResult *eventManager );
+  void endTestRun( CPPUNIT_NS::Test *test, 
+                   CPPUNIT_NS::TestResult *eventManager );
 
-  void startTest( CppUnit::Test *test );
+  void startTest( CPPUNIT_NS::Test *test );
 
-  void endTest( CppUnit::Test *test );
+  void endTest( CPPUNIT_NS::Test *test );
 
-  void startSuite( CppUnit::Test *suite );
+  void startSuite( CPPUNIT_NS::Test *suite );
 
-  void endSuite( CppUnit::Test *suite );
+  void endSuite( CPPUNIT_NS::Test *suite );
 
 private:
   void printStatistics() const;
diff --git a/examples/ClockerPlugIn/ClockerModel.cpp b/examples/ClockerPlugIn/ClockerModel.cpp
index 60e87ad..c20ede1 100644
--- a/examples/ClockerPlugIn/ClockerModel.cpp
+++ b/examples/ClockerPlugIn/ClockerModel.cpp
@@ -26,7 +26,7 @@ ClockerModel::setExpectedTestCount( int count )
 
 
 void 
-ClockerModel::enterTest( CppUnit::Test *test,
+ClockerModel::enterTest( CPPUNIT_NS::Test *test,
                          bool isSuite )
 {
   m_currentPath.add( test );
@@ -50,7 +50,7 @@ ClockerModel::enterTest( CppUnit::Test *test,
 
 
 void 
-ClockerModel::exitTest( CppUnit::Test *test,
+ClockerModel::exitTest( CPPUNIT_NS::Test *test,
                         bool isSuite )
 {
   m_tests[ m_testIndexes.top() ].m_timer.finish();
@@ -113,7 +113,7 @@ ClockerModel::isSuite( int testIndex ) const
 }
 
 
-const CppUnit::TestPath &
+const CPPUNIT_NS::TestPath &
 ClockerModel::testPathFor( int testIndex ) const
 {
   return m_tests[ testIndex ].m_path;
@@ -121,7 +121,7 @@ ClockerModel::testPathFor( int testIndex ) const
 
 
 int 
-ClockerModel::indexOf( CppUnit::Test *test ) const
+ClockerModel::indexOf( CPPUNIT_NS::Test *test ) const
 {
   TestToIndexes::const_iterator itFound = m_testToIndexes.find( test );
   if ( itFound != m_testToIndexes.end() )
diff --git a/examples/ClockerPlugIn/ClockerModel.h b/examples/ClockerPlugIn/ClockerModel.h
index c61a4b7..46f7ff1 100644
--- a/examples/ClockerPlugIn/ClockerModel.h
+++ b/examples/ClockerPlugIn/ClockerModel.h
@@ -7,10 +7,10 @@
 #define CLOCKERMODEL_H
 
 #include <cppunit/TestPath.h>
-#include <map>
-#include <stack>
+#include <cppunit/portability/CppUnitVector.h>
+#include <cppunit/portability/CppUnitMap.h>
+#include <cppunit/portability/CppUnitStack.h>
 #include <string>
-#include <vector>
 
 #ifdef CLOCKER_USE_WINNTTIMER
 #include "WinNtTimer.h"
@@ -33,17 +33,17 @@ public:
 
   void setExpectedTestCount( int count );
 
-  void enterTest( CppUnit::Test *test,
+  void enterTest( CPPUNIT_NS::Test *test,
                   bool isSuite );
 
-  void exitTest( CppUnit::Test *test,
+  void exitTest( CPPUNIT_NS::Test *test,
                  bool isSuite );
 
   double totalElapsedTime() const;
 
   double averageTestCaseTime() const;
 
-  double testTimeFor( CppUnit::Test *test ) const;
+  double testTimeFor( CPPUNIT_NS::Test *test ) const;
 
   double testTimeFor( int testIndex ) const;
 
@@ -51,10 +51,10 @@ public:
 
   bool isSuite( int testIndex ) const;
 
-  const CppUnit::TestPath &testPathFor( int testIndex ) const;
+  const CPPUNIT_NS::TestPath &testPathFor( int testIndex ) const;
 
   // -1 is none
-  int indexOf( CppUnit::Test *test ) const;
+  int indexOf( CPPUNIT_NS::Test *test ) const;
 
   int childCountFor( int testIndex ) const;
 
@@ -64,10 +64,10 @@ public:
 private:
   struct TestInfo
   {
-    CppUnit::TestPath m_path;
+    CPPUNIT_NS::TestPath m_path;
     Timer m_timer;
     bool m_isSuite;
-    std::vector<int> m_childIndexes;
+    CppUnitVector<int> m_childIndexes;
   };
 
   /// Prevents the use of the copy constructor.
@@ -77,16 +77,16 @@ private:
   void operator =( const ClockerModel &other );
 
 private:
-  CppUnit::TestPath m_currentPath;
+  CPPUNIT_NS::TestPath m_currentPath;
   
   int m_testCaseCount;
   double m_totalTestCaseTime;
 
-  typedef std::map<CppUnit::Test *, int> TestToIndexes;
+  typedef CppUnitMap<CPPUNIT_NS::Test *, int> TestToIndexes;
   
   TestToIndexes m_testToIndexes;
-  std::stack<int> m_testIndexes;
-  std::vector<TestInfo> m_tests;
+  CppUnitStack<int> m_testIndexes;
+  CppUnitVector<TestInfo> m_tests;
 };
 
 
diff --git a/examples/ClockerPlugIn/ClockerPlugIn.cpp b/examples/ClockerPlugIn/ClockerPlugIn.cpp
index dbdd672..3ff98c6 100644
--- a/examples/ClockerPlugIn/ClockerPlugIn.cpp
+++ b/examples/ClockerPlugIn/ClockerPlugIn.cpp
@@ -25,8 +25,8 @@ public:
   }
 
 
-  void initialize( CppUnit::TestFactoryRegistry *registry,
-                   const CppUnit::Parameters &parameters )
+  void initialize( CPPUNIT_NS::TestFactoryRegistry *registry,
+                   const CPPUNIT_NS::Parameters &parameters )
   {
     bool text = false;
     if ( parameters.size() > 0  &&  parameters[0] == "text" )
@@ -38,19 +38,19 @@ public:
   }
 
 
-  void addListener( CppUnit::TestResult *eventManager )
+  void addListener( CPPUNIT_NS::TestResult *eventManager )
   {
     eventManager->addListener( m_dumper );
   }
 
 
-  void removeListener( CppUnit::TestResult *eventManager )
+  void removeListener( CPPUNIT_NS::TestResult *eventManager )
   {
     eventManager->removeListener( m_dumper );
   }
 
 
-  void addXmlOutputterHooks( CppUnit::XmlOutputter *outputter )
+  void addXmlOutputterHooks( CPPUNIT_NS::XmlOutputter *outputter )
   {
     outputter->addHook( m_xmlHook );
   }
@@ -61,7 +61,7 @@ public:
   }
 
 
-  void uninitialize( CppUnit::TestFactoryRegistry *registry )
+  void uninitialize( CPPUNIT_NS::TestFactoryRegistry *registry )
   {
   }
 
diff --git a/examples/ClockerPlugIn/ClockerXmlHook.cpp b/examples/ClockerPlugIn/ClockerXmlHook.cpp
index 50c7df5..20cc2f8 100644
--- a/examples/ClockerPlugIn/ClockerXmlHook.cpp
+++ b/examples/ClockerPlugIn/ClockerXmlHook.cpp
@@ -23,9 +23,9 @@ ClockerXmlHook::~ClockerXmlHook()
 
 
 void 
-ClockerXmlHook::endDocument( CppUnit::XmlDocument *document )
+ClockerXmlHook::endDocument( CPPUNIT_NS::XmlDocument *document )
 {
-  CppUnit::XmlElement *testTreeElement = new CppUnit::XmlElement( "TimedTestTree" );
+  CPPUNIT_NS::XmlElement *testTreeElement = new CPPUNIT_NS::XmlElement( "TimedTestTree" );
   document->rootElement().addElement( testTreeElement );
 
   addTimedTest( testTreeElement, 0 );
@@ -33,19 +33,19 @@ ClockerXmlHook::endDocument( CppUnit::XmlDocument *document )
 
 
 void 
-ClockerXmlHook::addTimedTest( CppUnit::XmlElement *parentElement, 
+ClockerXmlHook::addTimedTest( CPPUNIT_NS::XmlElement *parentElement, 
                               int testIndex )
 {
   std::string elementName = m_model->isSuite( testIndex ) ? "TimedSuite" : "TimedTest";
-  CppUnit::XmlElement *testElement = new CppUnit::XmlElement( elementName );
+  CPPUNIT_NS::XmlElement *testElement = new CPPUNIT_NS::XmlElement( elementName );
   parentElement->addElement( testElement );
   testElement->addAttribute( "id", testIndex );
 
-  const CppUnit::TestPath &path = m_model->testPathFor( testIndex );
-  testElement->addElement( new CppUnit::XmlElement( "Name", 
+  const CPPUNIT_NS::TestPath &path = m_model->testPathFor( testIndex );
+  testElement->addElement( new CPPUNIT_NS::XmlElement( "Name", 
                                                     path.getChildTest()->getName() ) );
-  testElement->addElement( new CppUnit::XmlElement( "TestPath", path.toString() ) );
-  testElement->addElement( new CppUnit::XmlElement( "Time", 
+  testElement->addElement( new CPPUNIT_NS::XmlElement( "TestPath", path.toString() ) );
+  testElement->addElement( new CPPUNIT_NS::XmlElement( "Time", 
                                  ClockerModel::timeStringFor( 
                                     m_model->testTimeFor( testIndex ) ) ) );
 
@@ -58,37 +58,37 @@ ClockerXmlHook::addTimedTest( CppUnit::XmlElement *parentElement,
 
 
 void 
-ClockerXmlHook::failTestAdded( CppUnit::XmlDocument *document,
-                               CppUnit::XmlElement *testElement,
-                               CppUnit::Test *test,
-                               CppUnit::TestFailure *failure )
+ClockerXmlHook::failTestAdded( CPPUNIT_NS::XmlDocument *document,
+                               CPPUNIT_NS::XmlElement *testElement,
+                               CPPUNIT_NS::Test *test,
+                               CPPUNIT_NS::TestFailure *failure )
 {
   successfulTestAdded( document, testElement, test );
 }
 
 
 void 
-ClockerXmlHook::successfulTestAdded( CppUnit::XmlDocument *document,
-                                     CppUnit::XmlElement *testElement,
-                                     CppUnit::Test *test )
+ClockerXmlHook::successfulTestAdded( CPPUNIT_NS::XmlDocument *document,
+                                     CPPUNIT_NS::XmlElement *testElement,
+                                     CPPUNIT_NS::Test *test )
 {
   int testIndex = m_model->indexOf( test );
   double time = (testIndex >= 0) ? m_model->testTimeFor( testIndex ) : 0.0;
-  const CppUnit::TestPath &path = m_model->testPathFor( testIndex );
-  testElement->addElement( new CppUnit::XmlElement( "TestPath", path.toString() ) );
-  testElement->addElement( new CppUnit::XmlElement( "Time",
+  const CPPUNIT_NS::TestPath &path = m_model->testPathFor( testIndex );
+  testElement->addElement( new CPPUNIT_NS::XmlElement( "TestPath", path.toString() ) );
+  testElement->addElement( new CPPUNIT_NS::XmlElement( "Time",
                                    ClockerModel::timeStringFor( time ) ) );
 }
 
 
 void 
-ClockerXmlHook::statisticsAdded( CppUnit::XmlDocument *document,
-                                 CppUnit::XmlElement *statisticsElement )
+ClockerXmlHook::statisticsAdded( CPPUNIT_NS::XmlDocument *document,
+                                 CPPUNIT_NS::XmlElement *statisticsElement )
 {
   statisticsElement->addElement( 
-      new CppUnit::XmlElement( "TotalElapsedTime",
+      new CPPUNIT_NS::XmlElement( "TotalElapsedTime",
            ClockerModel::timeStringFor( m_model->totalElapsedTime() ) ) );
   statisticsElement->addElement( 
-      new CppUnit::XmlElement( "AverageTestCaseTime",
+      new CPPUNIT_NS::XmlElement( "AverageTestCaseTime",
            ClockerModel::timeStringFor( m_model->averageTestCaseTime() ) ) );
 }
diff --git a/examples/ClockerPlugIn/ClockerXmlHook.h b/examples/ClockerPlugIn/ClockerXmlHook.h
index d4f6ad3..831e106 100644
--- a/examples/ClockerPlugIn/ClockerXmlHook.h
+++ b/examples/ClockerPlugIn/ClockerXmlHook.h
@@ -13,7 +13,7 @@ class ClockerModel;
 
 
 /// XML output hook to add test timing and test hierarchy timing.
-class ClockerXmlHook : public CppUnit::XmlOutputterHook
+class ClockerXmlHook : public CPPUNIT_NS::XmlOutputterHook
 {
 public:
   /*! Constructs a ClockerXmlHook object.
@@ -23,19 +23,19 @@ public:
   /// Destructor.
   virtual ~ClockerXmlHook();
 
-  void endDocument( CppUnit::XmlDocument *document );
+  void endDocument( CPPUNIT_NS::XmlDocument *document );
 
-  void failTestAdded( CppUnit::XmlDocument *document,
-                      CppUnit::XmlElement *testElement,
-                      CppUnit::Test *test,
-                      CppUnit::TestFailure *failure );
+  void failTestAdded( CPPUNIT_NS::XmlDocument *document,
+                      CPPUNIT_NS::XmlElement *testElement,
+                      CPPUNIT_NS::Test *test,
+                      CPPUNIT_NS::TestFailure *failure );
 
-  void successfulTestAdded( CppUnit::XmlDocument *document,
-                            CppUnit::XmlElement *testElement,
-                            CppUnit::Test *test );
+  void successfulTestAdded( CPPUNIT_NS::XmlDocument *document,
+                            CPPUNIT_NS::XmlElement *testElement,
+                            CPPUNIT_NS::Test *test );
 
-  void statisticsAdded( CppUnit::XmlDocument *document,
-                        CppUnit::XmlElement *statisticsElement );
+  void statisticsAdded( CPPUNIT_NS::XmlDocument *document,
+                        CPPUNIT_NS::XmlElement *statisticsElement );
 
 private:
   /// Prevents the use of the copy constructor.
@@ -44,7 +44,7 @@ private:
   /// Prevents the use of the copy operator.
   void operator =( const ClockerXmlHook &other );
 
-  void addTimedTest( CppUnit::XmlElement *parentElement, 
+  void addTimedTest( CPPUNIT_NS::XmlElement *parentElement, 
                      int testIndex );
 
 private:
diff --git a/examples/DumperPlugIn/DumperListener.cpp b/examples/DumperPlugIn/DumperListener.cpp
index 3e6a5cb..dc4d066 100644
--- a/examples/DumperPlugIn/DumperListener.cpp
+++ b/examples/DumperPlugIn/DumperListener.cpp
@@ -22,7 +22,7 @@ DumperListener::~DumperListener()
 
 
 void 
-DumperListener::startTest( CppUnit::Test *test )
+DumperListener::startTest( CPPUNIT_NS::Test *test )
 {
   printPath( test, false );
   ++m_testCount;
@@ -30,7 +30,7 @@ DumperListener::startTest( CppUnit::Test *test )
 
 
 void 
-DumperListener::endTest( CppUnit::Test *test )
+DumperListener::endTest( CPPUNIT_NS::Test *test )
 {
   m_path.up();
   if ( !m_suiteHasTest.empty() )
@@ -42,7 +42,7 @@ DumperListener::endTest( CppUnit::Test *test )
 
 
 void 
-DumperListener::startSuite( CppUnit::Test *suite )
+DumperListener::startSuite( CPPUNIT_NS::Test *suite )
 {
   printPath( suite, true );
   ++m_suiteCount;
@@ -51,7 +51,7 @@ DumperListener::startSuite( CppUnit::Test *suite )
 
 
 void 
-DumperListener::endSuite( CppUnit::Test *suite )
+DumperListener::endSuite( CPPUNIT_NS::Test *suite )
 {
   m_path.up();
   if ( m_suiteHasTest.top() )
@@ -61,8 +61,8 @@ DumperListener::endSuite( CppUnit::Test *suite )
 
 
 void 
-DumperListener::endTestRun( CppUnit::Test *test, 
-                            CppUnit::TestResult *eventManager )
+DumperListener::endTestRun( CPPUNIT_NS::Test *test, 
+                            CPPUNIT_NS::TestResult *eventManager )
 {
   double average = 0;
   if ( m_suiteWithTestCount > 0 )
@@ -76,7 +76,7 @@ DumperListener::endTestRun( CppUnit::Test *test,
 
 
 void 
-DumperListener::printPath( CppUnit::Test *test, 
+DumperListener::printPath( CPPUNIT_NS::Test *test, 
                            bool isSuite )
 {
   m_path.add( test );
diff --git a/examples/DumperPlugIn/DumperListener.h b/examples/DumperPlugIn/DumperListener.h
index d048929..0e24f34 100644
--- a/examples/DumperPlugIn/DumperListener.h
+++ b/examples/DumperPlugIn/DumperListener.h
@@ -6,29 +6,29 @@
 #ifndef DUMPERLISTENER_H
 #define DUMPERLISTENER_H
 
+#include <cppunit/portability/CppUnitStack.h>
 #include <cppunit/TestListener.h>
 #include <cppunit/TestPath.h>
-#include <stack>
 
 
 /// TestListener that prints a flatten or hierarchical view of the test tree.
-class DumperListener : public CppUnit::TestListener
+class DumperListener : public CPPUNIT_NS::TestListener
 {
 public:
   DumperListener( bool flatten );
 
   virtual ~DumperListener();
 
-  void startTest( CppUnit::Test *test );
+  void startTest( CPPUNIT_NS::Test *test );
 
-  void endTest( CppUnit::Test *test );
+  void endTest( CPPUNIT_NS::Test *test );
 
-  void startSuite( CppUnit::Test *suite );
+  void startSuite( CPPUNIT_NS::Test *suite );
 
-  void endSuite( CppUnit::Test *suite );
+  void endSuite( CPPUNIT_NS::Test *suite );
 
-  void endTestRun( CppUnit::Test *test, 
-                   CppUnit::TestResult *eventManager );
+  void endTestRun( CPPUNIT_NS::Test *test, 
+                   CPPUNIT_NS::TestResult *eventManager );
 
 private:
   /// Prevents the use of the copy constructor.
@@ -37,7 +37,7 @@ private:
   /// Prevents the use of the copy operator.
   void operator =( const DumperListener &other );
 
-  void printPath( CppUnit::Test *test, 
+  void printPath( CPPUNIT_NS::Test *test, 
                   bool isSuite );
 
   void printFlattenedPath( bool isSuite );
@@ -48,13 +48,13 @@ private:
 
 private:
   bool m_flatten;
-  CppUnit::TestPath m_path;
+  CPPUNIT_NS::TestPath m_path;
   
   int m_suiteCount;
   int m_testCount;
   int m_suiteWithTestCount;
 
-  std::stack<bool> m_suiteHasTest;
+  CppUnitStack<bool> m_suiteHasTest;
 };
 
 
diff --git a/examples/DumperPlugIn/DumperPlugIn.cpp b/examples/DumperPlugIn/DumperPlugIn.cpp
index f7b545e..cec8412 100644
--- a/examples/DumperPlugIn/DumperPlugIn.cpp
+++ b/examples/DumperPlugIn/DumperPlugIn.cpp
@@ -18,8 +18,8 @@ public:
   }
 
 
-  void initialize( CppUnit::TestFactoryRegistry *registry,
-                   const CppUnit::Parameters &parameters )
+  void initialize( CPPUNIT_NS::TestFactoryRegistry *registry,
+                   const CPPUNIT_NS::Parameters &parameters )
   {
     bool flatten = false;
     if ( parameters.size() > 0  &&  parameters[0] == "flat" )
@@ -29,19 +29,19 @@ public:
   }
 
 
-  void addListener( CppUnit::TestResult *eventManager )
+  void addListener( CPPUNIT_NS::TestResult *eventManager )
   {
     eventManager->addListener( m_dumper );
   }
 
 
-  void removeListener( CppUnit::TestResult *eventManager )
+  void removeListener( CPPUNIT_NS::TestResult *eventManager )
   {
     eventManager->removeListener( m_dumper );
   }
 
 
-  void addXmlOutputterHooks( CppUnit::XmlOutputter *outputter )
+  void addXmlOutputterHooks( CPPUNIT_NS::XmlOutputter *outputter )
   {
   }
 
@@ -51,7 +51,7 @@ public:
   }
 
 
-  void uninitialize( CppUnit::TestFactoryRegistry *registry )
+  void uninitialize( CPPUNIT_NS::TestFactoryRegistry *registry )
   {
   }
 
diff --git a/examples/cppunittest/CoreSuite.h b/examples/cppunittest/CoreSuite.h
index e55387e..45b33b4 100644
--- a/examples/cppunittest/CoreSuite.h
+++ b/examples/cppunittest/CoreSuite.h
@@ -3,14 +3,9 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string coreSuiteName()
 {
-
-  inline std::string coreSuiteName()
-  {
-    return "Core";
-  }
-
+  return "Core";
 }
 
 #endif // CPPUNITTEST_CORESUITE_H
diff --git a/examples/cppunittest/CppUnitTestSuite.cpp b/examples/cppunittest/CppUnitTestSuite.cpp
index 35e8fd6..2b5ec2d 100644
--- a/examples/cppunittest/CppUnitTestSuite.cpp
+++ b/examples/cppunittest/CppUnitTestSuite.cpp
@@ -6,14 +6,9 @@
 #include "ToolsSuite.h"
 #include "UnitTestToolSuite.h"
 
-namespace CppUnitTest 
-{
-
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( coreSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( extensionSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( helperSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( outputSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( toolsSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( unitTestToolSuiteName() );
-
-}
\ No newline at end of file
diff --git a/examples/cppunittest/ExceptionTest.cpp b/examples/cppunittest/ExceptionTest.cpp
index c703c7d..31dce64 100644
--- a/examples/cppunittest/ExceptionTest.cpp
+++ b/examples/cppunittest/ExceptionTest.cpp
@@ -5,7 +5,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExceptionTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 ExceptionTest::ExceptionTest()
diff --git a/examples/cppunittest/ExtensionSuite.h b/examples/cppunittest/ExtensionSuite.h
index 037a8ee..8ddfcaf 100644
--- a/examples/cppunittest/ExtensionSuite.h
+++ b/examples/cppunittest/ExtensionSuite.h
@@ -3,14 +3,9 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string extensionSuiteName()
 {
-
-  inline std::string extensionSuiteName()
-  {
-    return "Extensions";
-  }
-
+  return "Extensions";
 }
 
 #endif // CPPUNITTEST_EXTENSIONSSUITE_H
diff --git a/examples/cppunittest/HelperMacrosTest.cpp b/examples/cppunittest/HelperMacrosTest.cpp
index 311b4a7..4300db6 100644
--- a/examples/cppunittest/HelperMacrosTest.cpp
+++ b/examples/cppunittest/HelperMacrosTest.cpp
@@ -115,7 +115,7 @@ public:
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( HelperMacrosTest, 
-                                       CppUnitTest::helperSuiteName() );
+                                       helperSuiteName() );
 
 
 HelperMacrosTest::HelperMacrosTest()
diff --git a/examples/cppunittest/HelperSuite.h b/examples/cppunittest/HelperSuite.h
index 6edeffd..55cca0a 100644
--- a/examples/cppunittest/HelperSuite.h
+++ b/examples/cppunittest/HelperSuite.h
@@ -3,14 +3,10 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string helperSuiteName()
 {
-
-  inline std::string helperSuiteName()
-  {
-    return "Helpers";
-  }
-
+  return "Helpers";
 }
 
+
 #endif // CPPUNITTEST_HELPERSUITE_H
diff --git a/examples/cppunittest/MessageTest.cpp b/examples/cppunittest/MessageTest.cpp
index 47a34da..c59544d 100644
--- a/examples/cppunittest/MessageTest.cpp
+++ b/examples/cppunittest/MessageTest.cpp
@@ -2,7 +2,7 @@
 #include "MessageTest.h"
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MessageTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 MessageTest::MessageTest()
diff --git a/examples/cppunittest/OrthodoxTest.cpp b/examples/cppunittest/OrthodoxTest.cpp
index 0da7180..ae1edb3 100644
--- a/examples/cppunittest/OrthodoxTest.cpp
+++ b/examples/cppunittest/OrthodoxTest.cpp
@@ -4,7 +4,7 @@
 #include <cppunit/TestResult.h>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( OrthodoxTest,
-                                       CppUnitTest::extensionSuiteName() );
+                                       extensionSuiteName() );
 
 OrthodoxTest::OrthodoxTest()
 {
diff --git a/examples/cppunittest/OutputSuite.h b/examples/cppunittest/OutputSuite.h
index 0f8ece7..d737699 100644
--- a/examples/cppunittest/OutputSuite.h
+++ b/examples/cppunittest/OutputSuite.h
@@ -3,14 +3,10 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string outputSuiteName()
 {
-
-  inline std::string outputSuiteName()
-  {
-    return "Output";
-  }
-
+  return "Output";
 }
 
+
 #endif // CPPUNITTEST_OUTPUTSUITE_H
diff --git a/examples/cppunittest/RepeatedTestTest.cpp b/examples/cppunittest/RepeatedTestTest.cpp
index 272a9a4..a8b1489 100644
--- a/examples/cppunittest/RepeatedTestTest.cpp
+++ b/examples/cppunittest/RepeatedTestTest.cpp
@@ -4,7 +4,7 @@
 #include <cppunit/TestResult.h>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RepeatedTestTest,
-                                       CppUnitTest::extensionSuiteName() );
+                                       extensionSuiteName() );
 
 
 RepeatedTestTest::RepeatedTestTest() :
diff --git a/examples/cppunittest/RepeatedTestTest.h b/examples/cppunittest/RepeatedTestTest.h
index 09e3cb5..609fed4 100644
--- a/examples/cppunittest/RepeatedTestTest.h
+++ b/examples/cppunittest/RepeatedTestTest.h
@@ -4,7 +4,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 
-class RepeatedTestTest : public CppUnit::TestFixture
+class RepeatedTestTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( RepeatedTestTest );
   CPPUNIT_TEST( testRun );
@@ -20,7 +20,7 @@ public:
   void testRun();
 
 private:
-  class RunCountTest : public CppUnit::TestCase
+  class RunCountTest : public CPPUNIT_NS::TestCase
   {
   public:
     RunCountTest() : m_runCount( 0 ) {}
@@ -38,7 +38,7 @@ private:
 
 private:
   RunCountTest *m_test;
-  CppUnit::Test *m_repeatedTest;
+  CPPUNIT_NS::Test *m_repeatedTest;
   const int m_repeatCount;
 };
 
diff --git a/examples/cppunittest/StringToolsTest.h b/examples/cppunittest/StringToolsTest.h
index 4a42e20..05a834a 100644
--- a/examples/cppunittest/StringToolsTest.h
+++ b/examples/cppunittest/StringToolsTest.h
@@ -6,7 +6,7 @@
 
 
 /// Unit tests for StringToolsTest
-class StringToolsTest : public CppUnit::TestCase
+class StringToolsTest : public CPPUNIT_NS::TestCase
 {
   CPPUNIT_TEST_SUITE( StringToolsTest );
   CPPUNIT_TEST( testToStringInt );
diff --git a/examples/cppunittest/TestAssertTest.cpp b/examples/cppunittest/TestAssertTest.cpp
index da471ad..e3b57ac 100644
--- a/examples/cppunittest/TestAssertTest.cpp
+++ b/examples/cppunittest/TestAssertTest.cpp
@@ -13,7 +13,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestAssertTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestAssertTest::TestAssertTest()
diff --git a/examples/cppunittest/TestCallerTest.cpp b/examples/cppunittest/TestCallerTest.cpp
index bdfb3d0..53b1aa4 100644
--- a/examples/cppunittest/TestCallerTest.cpp
+++ b/examples/cppunittest/TestCallerTest.cpp
@@ -6,7 +6,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestCallerTest, 
-                                       CppUnitTest::helperSuiteName() );
+                                       helperSuiteName() );
 
 
 void 
diff --git a/examples/cppunittest/TestCaseTest.cpp b/examples/cppunittest/TestCaseTest.cpp
index 3a948d4..8ed31bb 100644
--- a/examples/cppunittest/TestCaseTest.cpp
+++ b/examples/cppunittest/TestCaseTest.cpp
@@ -10,7 +10,7 @@
  */
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestCaseTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestCaseTest::TestCaseTest()
diff --git a/examples/cppunittest/TestDecoratorTest.cpp b/examples/cppunittest/TestDecoratorTest.cpp
index 48dd76d..86acab6 100644
--- a/examples/cppunittest/TestDecoratorTest.cpp
+++ b/examples/cppunittest/TestDecoratorTest.cpp
@@ -4,7 +4,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestDecoratorTest,
-                                       CppUnitTest::extensionSuiteName() );
+                                       extensionSuiteName() );
 
 
 TestDecoratorTest::TestDecoratorTest()
diff --git a/examples/cppunittest/TestFailureTest.cpp b/examples/cppunittest/TestFailureTest.cpp
index 6c76820..413460d 100644
--- a/examples/cppunittest/TestFailureTest.cpp
+++ b/examples/cppunittest/TestFailureTest.cpp
@@ -5,7 +5,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestFailureTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestFailureTest::TestFailureTest()
diff --git a/examples/cppunittest/TestPathTest.cpp b/examples/cppunittest/TestPathTest.cpp
index d664273..0f3d348 100644
--- a/examples/cppunittest/TestPathTest.cpp
+++ b/examples/cppunittest/TestPathTest.cpp
@@ -3,7 +3,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestPathTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestPathTest::TestPathTest()
diff --git a/examples/cppunittest/TestResultCollectorTest.cpp b/examples/cppunittest/TestResultCollectorTest.cpp
index 0d8fdd6..175250b 100644
--- a/examples/cppunittest/TestResultCollectorTest.cpp
+++ b/examples/cppunittest/TestResultCollectorTest.cpp
@@ -4,7 +4,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestResultCollectorTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestResultCollectorTest::TestResultCollectorTest()
diff --git a/examples/cppunittest/TestResultTest.cpp b/examples/cppunittest/TestResultTest.cpp
index f1987ac..1ff6c1c 100644
--- a/examples/cppunittest/TestResultTest.cpp
+++ b/examples/cppunittest/TestResultTest.cpp
@@ -3,7 +3,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestResultTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestResultTest::TestResultTest()
diff --git a/examples/cppunittest/TestSetUpTest.cpp b/examples/cppunittest/TestSetUpTest.cpp
index 6622d41..3f8f7dd 100644
--- a/examples/cppunittest/TestSetUpTest.cpp
+++ b/examples/cppunittest/TestSetUpTest.cpp
@@ -3,7 +3,7 @@
 #include <cppunit/TestResult.h>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestSetUpTest,
-                                       CppUnitTest::extensionSuiteName() );
+                                       extensionSuiteName() );
 
 
 TestSetUpTest::TestSetUpTest()
diff --git a/examples/cppunittest/TestSuiteTest.cpp b/examples/cppunittest/TestSuiteTest.cpp
index ae6e65a..ec4f4ad 100644
--- a/examples/cppunittest/TestSuiteTest.cpp
+++ b/examples/cppunittest/TestSuiteTest.cpp
@@ -5,7 +5,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestSuiteTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestSuiteTest::TestSuiteTest()
diff --git a/examples/cppunittest/TestSuiteTest.h b/examples/cppunittest/TestSuiteTest.h
index 3f9d21f..cdb301a 100644
--- a/examples/cppunittest/TestSuiteTest.h
+++ b/examples/cppunittest/TestSuiteTest.h
@@ -5,7 +5,7 @@
 #include <stdexcept>
 
 
-class TestSuiteTest : public CppUnit::TestFixture
+class TestSuiteTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestSuiteTest );
   CPPUNIT_TEST( testConstructor );
@@ -52,7 +52,7 @@ private:
   void operator =( const TestSuiteTest &copy );
 
 private:
-  CppUnit::TestSuite *m_suite;
+  CPPUNIT_NS::TestSuite *m_suite;
 };
 
 
diff --git a/examples/cppunittest/TestTest.cpp b/examples/cppunittest/TestTest.cpp
index a98cc08..4edc31c 100644
--- a/examples/cppunittest/TestTest.cpp
+++ b/examples/cppunittest/TestTest.cpp
@@ -3,7 +3,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestTest::TestTest() : 
diff --git a/examples/cppunittest/ToolsSuite.h b/examples/cppunittest/ToolsSuite.h
index 04a2edd..3d3efc0 100644
--- a/examples/cppunittest/ToolsSuite.h
+++ b/examples/cppunittest/ToolsSuite.h
@@ -3,14 +3,9 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string toolsSuiteName()
 {
-
-  inline std::string toolsSuiteName()
-  {
-    return "Tools";
-  }
-
+  return "Tools";
 }
 
 #endif // CPPUNITTEST_TOOLSSUITE_H
diff --git a/examples/cppunittest/UnitTestToolSuite.h b/examples/cppunittest/UnitTestToolSuite.h
index 90a0b0c..7d2341e 100644
--- a/examples/cppunittest/UnitTestToolSuite.h
+++ b/examples/cppunittest/UnitTestToolSuite.h
@@ -3,14 +3,9 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string unitTestToolSuiteName()
 {
-
-  inline std::string unitTestToolSuiteName()
-  {
-    return "UnitTestTool";
-  }
-
+  return "UnitTestTool";
 }
 
 #endif // CPPUNITTEST_UNITTESTTOOLSUITE_H
diff --git a/examples/cppunittest/XmlElementTest.cpp b/examples/cppunittest/XmlElementTest.cpp
index 02ffee7..3b5bd4c 100644
--- a/examples/cppunittest/XmlElementTest.cpp
+++ b/examples/cppunittest/XmlElementTest.cpp
@@ -5,7 +5,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlElementTest, 
-                                       CppUnitTest::toolsSuiteName() );
+                                       toolsSuiteName() );
 
 
 XmlElementTest::XmlElementTest()
diff --git a/examples/cppunittest/XmlElementTest.h b/examples/cppunittest/XmlElementTest.h
index acdcde2..875ee51 100644
--- a/examples/cppunittest/XmlElementTest.h
+++ b/examples/cppunittest/XmlElementTest.h
@@ -7,7 +7,7 @@
 
 /*! Unit tests for XmlElement.
  */
-class XmlElementTest : public CppUnit::TestFixture
+class XmlElementTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( XmlElementTest );
   CPPUNIT_TEST( testStringContentConstructor );
diff --git a/examples/cppunittest/XmlOutputterTest.cpp b/examples/cppunittest/XmlOutputterTest.cpp
index 486f00c..5a64ff9 100644
--- a/examples/cppunittest/XmlOutputterTest.cpp
+++ b/examples/cppunittest/XmlOutputterTest.cpp
@@ -8,7 +8,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlOutputterTest, 
-                                       CppUnitTest::outputSuiteName() );
+                                       outputSuiteName() );
 
 
 XmlOutputterTest::XmlOutputterTest()
diff --git a/examples/cppunittest/XmlOutputterTest.h b/examples/cppunittest/XmlOutputterTest.h
index c451a2b..697a452 100644
--- a/examples/cppunittest/XmlOutputterTest.h
+++ b/examples/cppunittest/XmlOutputterTest.h
@@ -2,10 +2,10 @@
 #define CPPUNITEST_XMLTESTRESULTOUTPUTTERTEST_H
 
 #include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/portability/CppUnitDeque.h>
 #include <cppunit/Test.h>
 #include <cppunit/TestFailure.h>
 #include <cppunit/TestResultCollector.h>
-#include <deque>
 
 
 /*! \class XmlOutputterTest
@@ -70,7 +70,7 @@ private:
 
 private:
   CPPUNIT_NS::TestResultCollector *m_result;
-  std::deque<CPPUNIT_NS::Test *> m_dummyTests;
+  CppUnitDeque<CPPUNIT_NS::Test *> m_dummyTests;
 };
 
 
diff --git a/examples/cppunittest/XmlUniformiser.cpp b/examples/cppunittest/XmlUniformiser.cpp
index e884e20..f989081 100644
--- a/examples/cppunittest/XmlUniformiser.cpp
+++ b/examples/cppunittest/XmlUniformiser.cpp
@@ -1,9 +1,5 @@
 #include "XmlUniformiser.h"
 
-namespace CppUnitTest
-{
-
-
 
 int 
 notEqualIndex( std::string expectedXml,
@@ -36,10 +32,10 @@ checkXmlEqual( std::string expectedXml,
   message  <<  "differ at index: "  <<  index  << "\n"
            <<  "expected: "  <<  expected.substr(index) << "\n"
            <<  "but was : "  <<  actual.substr( index );
-  ::CPPUNIT_NS::Asserter::failNotEqual( expected,
-                                     actual,
-                                     sourceLine,
-                                     message.str() );
+  CPPUNIT_NS::Asserter::failNotEqual( expected,
+                                      actual,
+                                      sourceLine,
+                                      message.str() );
 }
 
 
@@ -235,6 +231,3 @@ XmlUniformiser::removeTrailingSpaces()
     --index;
   m_stripped.resize( index );
 }
-
-
-}  // namespace CppUnitTest
diff --git a/examples/cppunittest/XmlUniformiser.h b/examples/cppunittest/XmlUniformiser.h
index d1e98d5..a63bbc8 100644
--- a/examples/cppunittest/XmlUniformiser.h
+++ b/examples/cppunittest/XmlUniformiser.h
@@ -6,10 +6,6 @@
 #include <string>
 
 
-namespace CppUnitTest
-{
-
-
 /*! Uniformise an XML string.
  *
  * Strips spaces between attribut in Element.
@@ -54,16 +50,14 @@ private:
 void 
 checkXmlEqual( std::string expectedXml,
                std::string actualXml,
-               CppUnit::SourceLine sourceLine );
+               CPPUNIT_NS::SourceLine sourceLine );
 
 
 /// Asserts that two XML strings are equivalent.
 #define CPPUNITTEST_ASSERT_XML_EQUAL( expected, actual ) \
-    ::CppUnitTest::checkXmlEqual( expected, actual,      \
-                                  CPPUNIT_SOURCELINE() )
-
+    ::checkXmlEqual( expected, actual,      \
+                     CPPUNIT_SOURCELINE() )
 
 
-}  // namespace CppUnitTest
 
 #endif  // XMLUNIFORMISER_H
diff --git a/examples/cppunittest/XmlUniformiserTest.cpp b/examples/cppunittest/XmlUniformiserTest.cpp
index d99b457..99d7ed0 100644
--- a/examples/cppunittest/XmlUniformiserTest.cpp
+++ b/examples/cppunittest/XmlUniformiserTest.cpp
@@ -4,7 +4,7 @@
 #include "XmlUniformiser.h"
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlUniformiserTest, 
-                                       CppUnitTest::unitTestToolSuiteName() );
+                                       unitTestToolSuiteName() );
 
 
 XmlUniformiserTest::XmlUniformiserTest()
@@ -142,6 +142,6 @@ void
 XmlUniformiserTest::check( const std::string &xml, 
                            const std::string &expectedStrippedXml )
 {
-  std::string actual = CppUnitTest::XmlUniformiser( xml ).stripped();
+  std::string actual = XmlUniformiser( xml ).stripped();
   CPPUNIT_ASSERT_EQUAL( expectedStrippedXml, actual );
 }
diff --git a/examples/examples.opt b/examples/examples.opt
index ecb0740..e36ca4a 100644
--- a/examples/examples.opt
+++ b/examples/examples.opt
diff --git a/examples/hierarchy/BoardGameTest.h b/examples/hierarchy/BoardGameTest.h
index e522b4b..0198944 100644
--- a/examples/hierarchy/BoardGameTest.h
+++ b/examples/hierarchy/BoardGameTest.h
@@ -5,7 +5,7 @@
 #include <iostream>
 
 template<class GAMECLASS> 
-class BoardGameTest : public CppUnit::TestFixture 
+class BoardGameTest : public CPPUNIT_NS::TestFixture 
 {
   CPPUNIT_TEST_SUITE( BoardGameTest );
   CPPUNIT_TEST( testReset );
diff --git a/examples/hierarchy/main.cpp b/examples/hierarchy/main.cpp
index 4de8275..6b7dbea 100644
--- a/examples/hierarchy/main.cpp
+++ b/examples/hierarchy/main.cpp
@@ -10,7 +10,7 @@
 int 
 main(int argc, char** argv)
 {
-  CppUnit::TextUi::TestRunner runner;
+  CPPUNIT_NS::TextUi::TestRunner runner;
 
   runner.addTest( BoardGameTest<BoardGame>::suite() );
   runner.addTest( ChessTest<Chess>::suite() );
diff --git a/examples/money/MoneyApp.cpp b/examples/money/MoneyApp.cpp
index 18327f5..e6242fa 100644
--- a/examples/money/MoneyApp.cpp
+++ b/examples/money/MoneyApp.cpp
@@ -7,14 +7,14 @@
 int main(int argc, char* argv[])
 {
   // Get the top level suite from the registry
-  CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
+  CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest();
 
   // Adds the test to the list of test to run
-  CppUnit::TextUi::TestRunner runner;
+  CPPUNIT_NS::TextUi::TestRunner runner;
   runner.addTest( suite );
 
   // Change the default outputter to a compiler error format outputter
-  runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(),
+  runner.setOutputter( new CPPUNIT_NS::CompilerOutputter( &runner.result(),
                                                        std::cerr ) );
   // Run the test.
   bool wasSucessful = runner.run();
diff --git a/examples/money/MoneyTest.h b/examples/money/MoneyTest.h
index 0f4f145..44e1808 100644
--- a/examples/money/MoneyTest.h
+++ b/examples/money/MoneyTest.h
@@ -4,7 +4,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-class MoneyTest : public CppUnit::TestFixture
+class MoneyTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( MoneyTest );
   CPPUNIT_TEST( testConstructor );
diff --git a/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp b/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp
index c83f7dd..cbb9d21 100644
--- a/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp
+++ b/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp
@@ -71,9 +71,9 @@ CppUnitTestApp::InitInstance()
 void 
 CppUnitTestApp::RunTests()
 {
-  CppUnit::MfcUi::TestRunner runner;
+  CPPUNIT_NS::MfcUi::TestRunner runner;
 
-  runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+  runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() );
 
   runner.run();
 }
diff --git a/examples/msvc6/HostApp/ExampleTestCase.h b/examples/msvc6/HostApp/ExampleTestCase.h
index 7c993ee..cbe139e 100644
--- a/examples/msvc6/HostApp/ExampleTestCase.h
+++ b/examples/msvc6/HostApp/ExampleTestCase.h
@@ -11,7 +11,7 @@
  *
  */
 
-class ExampleTestCase : public CppUnit::TestCase
+class ExampleTestCase : public CPPUNIT_NS::TestCase
 {
   CPPUNIT_TEST_SUITE( ExampleTestCase );
   CPPUNIT_TEST( example );
diff --git a/examples/msvc6/HostApp/HostApp.cpp b/examples/msvc6/HostApp/HostApp.cpp
index 5059de9..fc63496 100644
--- a/examples/msvc6/HostApp/HostApp.cpp
+++ b/examples/msvc6/HostApp/HostApp.cpp
@@ -108,8 +108,8 @@ BOOL CHostAppApp::InitInstance()
 void 
 CHostAppApp::RunUnitTests()
 {
-  CppUnit::MfcUi::TestRunner runner;
-  runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+  CPPUNIT_NS::MfcUi::TestRunner runner;
+  runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() );
 
   runner.run();    
 }
diff --git a/examples/simple/ExampleTestCase.h b/examples/simple/ExampleTestCase.h
index 2531d32..df3a6c9 100644
--- a/examples/simple/ExampleTestCase.h
+++ b/examples/simple/ExampleTestCase.h
@@ -11,7 +11,7 @@
  *
  */
 
-class ExampleTestCase : public CppUnit::TestCase
+class ExampleTestCase : public CPPUNIT_NS::TestCase
 {
   CPPUNIT_TEST_SUITE( ExampleTestCase );
   CPPUNIT_TEST( example );
diff --git a/examples/simple/Main.cpp b/examples/simple/Main.cpp
index fb50396..9aff95f 100644
--- a/examples/simple/Main.cpp
+++ b/examples/simple/Main.cpp
@@ -10,23 +10,23 @@ int
 main( int argc, char* argv[] )
 {
   // Create the event manager and test controller
-  CppUnit::TestResult controller;
+  CPPUNIT_NS::TestResult controller;
 
   // Add a listener that colllects test result
-  CppUnit::TestResultCollector result;
+  CPPUNIT_NS::TestResultCollector result;
   controller.addListener( &result );        
 
   // Add a listener that print dots as test run.
-  CppUnit::BriefTestProgressListener progress;
+  CPPUNIT_NS::BriefTestProgressListener progress;
   controller.addListener( &progress );      
 
   // Add the top suite to the test runner
-  CppUnit::TestRunner runner;
-  runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+  CPPUNIT_NS::TestRunner runner;
+  runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() );
   runner.run( controller );
 
   // Print test in a compiler compatible format.
-  CppUnit::CompilerOutputter outputter( &result, std::cerr );
+  CPPUNIT_NS::CompilerOutputter outputter( &result, std::cerr );
   outputter.write(); 
 
   return result.wasSuccessful() ? 0 : 1;