3 files changed, 19 insertions, 22 deletions
diff --git a/include/cppunit/ui/mfc/TestRunner.h b/include/cppunit/ui/mfc/TestRunner.h
index b58ee42..7186bf6 100644
--- a/include/cppunit/ui/mfc/TestRunner.h
+++ b/include/cppunit/ui/mfc/TestRunner.h
@@ -24,8 +24,8 @@
    - export class using AFX_EXT_CLASS
  */
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
+
   class Test;
   class TestSuite;
 
@@ -61,23 +61,24 @@ public:
 
   void run();
 
-  void addTest( CppUnit::Test *test );
+  void addTest( Test *test );
 
-  void addTests( const std::vector<CppUnit::Test *> &tests );
+  void addTests( const std::vector<Test *> &tests );
 
 protected:
-  CppUnit::Test *getRootTest();
+  Test *getRootTest();
 
-  CppUnit::TestSuite *m_suite;
+  TestSuite *m_suite;
 
-  typedef std::vector<CppUnit::Test *> Tests;
+  typedef std::vector<Test *> Tests;
   Tests m_tests;
 };
 
 
 } // namespace MfcUi
 
-} // namespace CppUnit
+
+CPPUNIT_NS_END
 
 
 #endif  // CPPUNITUI_MFC_TESTRUNNER_H
diff --git a/include/cppunit/ui/qt/TestRunner.h b/include/cppunit/ui/qt/TestRunner.h
index d293b08..d58772b 100644
--- a/include/cppunit/ui/qt/TestRunner.h
+++ b/include/cppunit/ui/qt/TestRunner.h
@@ -9,8 +9,9 @@
 #include <vector>
 #include "Config.h"
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
+
+
   class Test;
   class TestSuite;
 
@@ -51,7 +52,7 @@ public:
 
   void run( bool autoRun =false );
 
-  void addTest( CppUnit::Test *test );
+  void addTest( Test *test );
 
 private:
   /// Prevents the use of the copy constructor.
@@ -70,12 +71,6 @@ private:
 };
 
 
-
-// Inlines methods for TestRunner:
-// -------------------------------
-
-
-  }  // namespace QtUi
-}  // namespace CppUnit
+CPPUNIT_NS_END
 
 #endif  // CPPUNIT_QTUI_TESTRUNNER_H
diff --git a/include/cppunit/ui/text/TestRunner.h b/include/cppunit/ui/text/TestRunner.h
index 93c7352..13bb8b0 100644
--- a/include/cppunit/ui/text/TestRunner.h
+++ b/include/cppunit/ui/text/TestRunner.h
@@ -8,7 +8,8 @@
 #include <vector>
 #include <cppunit/TestRunner.h>
 
-namespace CppUnit {
+CPPUNIT_NS_BEGIN
+
 
 class Outputter;
 class Test;
@@ -62,11 +63,11 @@ namespace TextUi
  *
  * \see CompilerOutputter, XmlOutputter, TextOutputter.
  */
-class CPPUNIT_API TestRunner : public CppUnit::TestRunner
+class CPPUNIT_API TestRunner : public CPPUNIT_NS(TestRunner)
 {
 public:
   // Work around VC++ bug (class has same name as parent)
-  typedef CppUnit::TestRunner SuperClass;
+  typedef CPPUNIT_NS(TestRunner) SuperClass;
 
   TestRunner( Outputter *outputter =NULL );
 
@@ -95,6 +96,6 @@ protected:
 
 } // namespace TextUi
 
-} // namespace CppUnit
+CPPUNIT_NS_END
 
 #endif  // CPPUNIT_UI_TEXT_TESTRUNNER_H