From 8fe1e5f9c519e3e6b9f2934b9809e9d8b4b64174 Mon Sep 17 00:00:00 2001
From: jez <>
Date: Mon, 10 Sep 2007 17:39:52 +0000
Subject: [PATCH] moved convert_adaptor and convertstream into Arabica::io
 namespace

---
 include/SAX/SAXParseException.hpp   |  2 --
 include/Utils/StringAdaptor.hpp     |  4 ++--
 include/io/convert_adaptor.hpp      |  4 ++--
 include/io/convertstream.hpp        |  4 ++--
 tests/silly_string/silly_string.cpp | 12 ++++++------
 vs8/lib_arabica.vcproj              |  2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/include/SAX/SAXParseException.hpp b/include/SAX/SAXParseException.hpp
index 04767289..d3889127 100644
--- a/include/SAX/SAXParseException.hpp
+++ b/include/SAX/SAXParseException.hpp
@@ -6,8 +6,6 @@
 
 #include <SAX/SAXException.hpp>
 #include <SAX/Locator.hpp>
-#include <sstream>
-#include <io/convertstream.hpp>
 #include <Utils/StringAdaptor.hpp>
 
 namespace Arabica
diff --git a/include/Utils/StringAdaptor.hpp b/include/Utils/StringAdaptor.hpp
index aff1b127..da6181d1 100644
--- a/include/Utils/StringAdaptor.hpp
+++ b/include/Utils/StringAdaptor.hpp
@@ -79,9 +79,9 @@ public:
   static string_type construct_from_utf16(const wchar_t* str, int length);
   static std::wstring asStdWString(const string_type& str);
 
-  typedef Arabica::convert::basic_iconvertstream<wchar_t, std::char_traits<wchar_t>,
+  typedef Arabica::io::basic_iconvertstream<wchar_t, std::char_traits<wchar_t>,
                                char, std::char_traits<char> > widener_t;
-  typedef Arabica::convert::basic_oconvertstream<wchar_t, std::char_traits<wchar_t>,
+  typedef Arabica::io::basic_oconvertstream<wchar_t, std::char_traits<wchar_t>,
                                char, std::char_traits<char> > narrower_t;
 
 
diff --git a/include/io/convert_adaptor.hpp b/include/io/convert_adaptor.hpp
index b79d0bf7..f1e3f7e1 100644
--- a/include/io/convert_adaptor.hpp
+++ b/include/io/convert_adaptor.hpp
@@ -26,7 +26,7 @@
 
 namespace Arabica
 {
-namespace convert
+namespace io
 {
 
 template<typename charT, 
@@ -349,6 +349,6 @@ class oconvert_adaptor : private convert_adaptor_buffer<charT, traitsT, toCharT,
     void set_stream(toStreamT& toStream) { bufadaptor_.set_buffer(*toStream.rdbuf()); }
 }; // class oconvert_adaptor
 
-} // namespace convert
+} // namespace io
 } // namespace Arabica
 #endif
diff --git a/include/io/convertstream.hpp b/include/io/convertstream.hpp
index 08309a44..64606752 100644
--- a/include/io/convertstream.hpp
+++ b/include/io/convertstream.hpp
@@ -50,7 +50,7 @@
 
 namespace Arabica
 {
-namespace convert
+namespace io
 {
 
 template<typename charT, typename traitsT>
@@ -297,6 +297,6 @@ typedef basic_iconvertstream<wchar_t> converting_iwstringstream;
 typedef basic_oconvertstream<wchar_t> converting_owstringstream;
 #endif
 
-} // namespace convert
+} // namespace io
 } // namespace Arabica
 #endif
diff --git a/tests/silly_string/silly_string.cpp b/tests/silly_string/silly_string.cpp
index 737397c3..f62fc6d7 100644
--- a/tests/silly_string/silly_string.cpp
+++ b/tests/silly_string/silly_string.cpp
@@ -54,8 +54,8 @@ silly_string silly_string_adaptor::construct_from_utf8(const char* str, int leng
 #ifndef ARABICA_NO_WCHAR_T
 silly_string silly_string_adaptor::construct_from_utf16(const wchar_t* str)
 {
-  Arabica::convert::basic_oconvertstream<wchar_t, std::char_traits<wchar_t>,
-                                         char, std::char_traits<char> > narrower;
+  Arabica::io::basic_oconvertstream<wchar_t, std::char_traits<wchar_t>,
+                                    char, std::char_traits<char> > narrower;
   narrower.imbue(std::locale(narrower.getloc(), new Arabica::convert::utf8ucs2codecvt()));
   narrower.str(str ? str : L"");
   silly_string s;
@@ -65,8 +65,8 @@ silly_string silly_string_adaptor::construct_from_utf16(const wchar_t* str)
 
 silly_string silly_string_adaptor::construct_from_utf16(const wchar_t* str, int length)
 {
-  Arabica::convert::basic_oconvertstream<wchar_t, std::char_traits<wchar_t>,
-                                         char, std::char_traits<char> > narrower;
+  Arabica::io::basic_oconvertstream<wchar_t, std::char_traits<wchar_t>,
+                                    char, std::char_traits<char> > narrower;
   narrower.imbue(std::locale(narrower.getloc(), new Arabica::convert::utf8ucs2codecvt()));
   narrower.str(std::wstring(str, length));
   silly_string s;
@@ -130,8 +130,8 @@ std::string silly_string_adaptor::asStdString(const silly_string& str)
 #ifndef ARABICA_NO_WCHAR_T
 std::wstring silly_string_adaptor::asStdWString(const silly_string& str)
 {
-  Arabica::convert::basic_oconvertstream<char, std::char_traits<char>,
-                                         wchar_t, std::char_traits<wchar_t> > widener;
+  Arabica::io::basic_oconvertstream<char, std::char_traits<char>,
+                                    wchar_t, std::char_traits<wchar_t> > widener;
   std::codecvt<char, wchar_t, std::mbstate_t>* cc = new Arabica::convert::ucs2utf8codecvt();
   widener.imbue(std::locale(widener.getloc(), cc));
   widener.str(str.s_);
diff --git a/vs8/lib_arabica.vcproj b/vs8/lib_arabica.vcproj
index 8096d22d..f3187131 100644
--- a/vs8/lib_arabica.vcproj
+++ b/vs8/lib_arabica.vcproj
@@ -922,7 +922,7 @@
 				</FileConfiguration>
 			</File>
 			<Filter
-				Name="Utils"
+				Name="XML"
 				>
 				<File
 					RelativePath="..\src\XML\XMLCharacterClasses.cpp"