3 files changed, 17 insertions, 21 deletions
diff --git a/include/cppunit/tools/StringTools.h b/include/cppunit/tools/StringTools.h
index cc325dc..d08c6e0 100644
--- a/include/cppunit/tools/StringTools.h
+++ b/include/cppunit/tools/StringTools.h
@@ -6,30 +6,29 @@
 #include <vector>
 
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
+
 
 /*! \brief Tool functions to manipulate string.
  */
-namespace StringTools
+struct StringTools
 {
 
   typedef std::vector<std::string> Strings;
 
-  std::string CPPUNIT_API toString( int value );
-
-  std::string CPPUNIT_API toString( double value );
+  static std::string CPPUNIT_API toString( int value );
 
-  Strings CPPUNIT_API split( const std::string &text, 
-                             char separator );
+  static std::string CPPUNIT_API toString( double value );
 
-  std::string CPPUNIT_API wrap( const std::string &text,
-                                int wrapColumn = 79 );
+  static Strings CPPUNIT_API split( const std::string &text, 
+                                    char separator );
 
-} // namespace StringTools
+  static std::string CPPUNIT_API wrap( const std::string &text,
+                                       int wrapColumn = CPPUNIT_WRAP_COLUMN );
 
+};
 
-} //  namespace CppUnit
 
+CPPUNIT_NS_END
 
 #endif  // CPPUNIT_TOOLS_STRINGTOOLS_H
diff --git a/include/cppunit/tools/XmlDocument.h b/include/cppunit/tools/XmlDocument.h
index 564fb20..005c736 100644
--- a/include/cppunit/tools/XmlDocument.h
+++ b/include/cppunit/tools/XmlDocument.h
@@ -11,8 +11,8 @@
 #include <string>
 
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
+
 
 class XmlElement;
 
@@ -64,7 +64,6 @@ protected:
 #endif
 
 
-} //  namespace CppUnit
-
+CPPUNIT_NS_END
 
 #endif  // CPPUNIT_TOOLS_XMLDOCUMENT_H
diff --git a/include/cppunit/tools/XmlElement.h b/include/cppunit/tools/XmlElement.h
index 760002d..8d4d504 100644
--- a/include/cppunit/tools/XmlElement.h
+++ b/include/cppunit/tools/XmlElement.h
@@ -12,8 +12,8 @@
 #include <string>
 
 
-namespace CppUnit
-{
+CPPUNIT_NS_BEGIN
+
 
 class XmlElement;
 
@@ -139,9 +139,7 @@ private:
 };
 
 
-
-} //  namespace CppUnit
-
+CPPUNIT_NS_END
 
 #if CPPUNIT_NEED_DLL_DECL
 #pragma warning( pop )