4 files changed, 14 insertions, 12 deletions

diff --git a/include/cppunit/plugin/Parameters.h b/include/cppunit/plugin/Parameters.h
index 54a26d2..e914f3f 100644
--- a/include/cppunit/plugin/Parameters.h
+++ b/include/cppunit/plugin/Parameters.h
@@ -5,13 +5,13 @@
 
 #if !defined(CPPUNIT_NO_TESTPLUGIN)
 
-#include <deque>
+#include <cppunit/portability/CppUnitDeque.h>
 #include <string>
 
 CPPUNIT_NS_BEGIN
 
 
-typedef std::deque<std::string> Parameters;
+typedef CppUnitDeque<std::string> Parameters;
 
 
 CPPUNIT_NS_END
diff --git a/include/cppunit/plugin/PlugInManager.h b/include/cppunit/plugin/PlugInManager.h
index 87455f0..585ac89 100644
--- a/include/cppunit/plugin/PlugInManager.h
+++ b/include/cppunit/plugin/PlugInManager.h
@@ -74,6 +74,8 @@ public:
   void removeXmlOutputterHooks();
 
 protected:
+  /*! \brief (INTERNAL) Information about a specific plug-in.
+   */
   struct PlugInInfo
   {
     std::string m_fileName;
@@ -94,7 +96,7 @@ private:
   void operator =( const PlugInManager &copy );
 
 private:
-  typedef std::deque<PlugInInfo> PlugIns;
+  typedef CppUnitDeque<PlugInInfo> PlugIns;
   PlugIns m_plugIns;
 };
 
diff --git a/include/cppunit/plugin/TestPlugIn.h b/include/cppunit/plugin/TestPlugIn.h
index 568293e..d206d79 100644
--- a/include/cppunit/plugin/TestPlugIn.h
+++ b/include/cppunit/plugin/TestPlugIn.h
@@ -20,7 +20,7 @@ class XmlOutputter;
  */
 
 
-/*! Test plug-in interface.
+/*! \brief Test plug-in interface.
  * \ingroup WritingTestPlugIn
  *
  * This class define the interface implemented by test plug-in. A pointer to that
@@ -54,8 +54,8 @@ struct CppUnitTestPlugIn
    * N.B.: Parameters interface is not define yet, and the plug-in runner does
    * not yet support plug-in parameter.
    */
-  virtual void initialize( CPPUNIT_NS(TestFactoryRegistry) *registry,
-                           const CPPUNIT_NS(Parameters) &parameters ) =0;
+  virtual void initialize( CPPUNIT_NS::TestFactoryRegistry *registry,
+                           const CPPUNIT_NS::Parameters &parameters ) =0;
 
   /*! Gives a chance to the plug-in to register TestListener.
    * 
@@ -64,17 +64,17 @@ struct CppUnitTestPlugIn
    * setUp some global resource: listen to TestListener::startTestRun(), 
    * and TestListener::endTestRun().
    */
-  virtual void addListener( CPPUNIT_NS(TestResult) *eventManager ) =0;
+  virtual void addListener( CPPUNIT_NS::TestResult *eventManager ) =0;
 
   /*! Gives a chance to the plug-in to remove its registered TestListener.
    *
    * Override this method to remove a TestListener that has been added.
    */
-  virtual void removeListener( CPPUNIT_NS(TestResult) *eventManager ) =0;
+  virtual void removeListener( CPPUNIT_NS::TestResult *eventManager ) =0;
 
   /*! Provides a way for the plug-in to register some XmlOutputterHook.
    */
-  virtual void addXmlOutputterHooks( CPPUNIT_NS(XmlOutputter) *outputter ) =0;
+  virtual void addXmlOutputterHooks( CPPUNIT_NS::XmlOutputter *outputter ) =0;
 
   /*! Called when the XmlOutputter is destroyed.
    * 
@@ -90,7 +90,7 @@ struct CppUnitTestPlugIn
    * reference on test that are no longer available if they are not 
    * unregistered.
    */
-  virtual void uninitialize( CPPUNIT_NS(TestFactoryRegistry) *registry ) =0;
+  virtual void uninitialize( CPPUNIT_NS::TestFactoryRegistry *registry ) =0;
 };
 
 
@@ -186,7 +186,7 @@ typedef CppUnitTestPlugIn *(*TestPlugInSignature)();
  * \see CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL(), CPPUNIT_PLUGIN_IMPLEMENT_MAIN().
  */
 #define CPPUNIT_PLUGIN_IMPLEMENT()                                          \
-  CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( CPPUNIT_NS(TestPlugInDefaultImpl) );  \
+  CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( CPPUNIT_NS::TestPlugInDefaultImpl );  \
   CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
 
 
diff --git a/include/cppunit/plugin/TestPlugInDefaultImpl.h b/include/cppunit/plugin/TestPlugInDefaultImpl.h
index a6cc09e..f1efd81 100644
--- a/include/cppunit/plugin/TestPlugInDefaultImpl.h
+++ b/include/cppunit/plugin/TestPlugInDefaultImpl.h
@@ -13,7 +13,7 @@ CPPUNIT_NS_BEGIN
 class TestSuite;
 
 
-/*! Default implementation of test plug-in interface.
+/*! \brief Default implementation of test plug-in interface.
  * \ingroup WritingTestPlugIn
  *
  * Override getSuiteName() to specify the suite name. Default is "All Tests".