moved codecvt facets into convert subdirectory

examples/Utils/transcode.cpp

@@ -10,14 +10,14 @@
 
 #include <iostream>
 #include <Utils/convert_adaptor.hpp>
-#include <Utils/utf8iso88591codecvt.hpp>
+#include <convert/utf8iso88591codecvt.hpp>
-#include <Utils/iso88591utf8codecvt.hpp>
+#include <convert/iso88591utf8codecvt.hpp>
-#include <Utils/rot13codecvt.hpp>
+#include <convert/rot13codecvt.hpp>
-#include <Utils/base64codecvt.hpp>
+#include <convert/base64codecvt.hpp>
-#include <Utils/utf8ucs2codecvt.hpp>
+#include <convert/utf8ucs2codecvt.hpp>
-#include <Utils/utf16utf8codecvt.hpp>
+#include <convert/utf16utf8codecvt.hpp>
-#include <Utils/utf16beucs2codecvt.hpp>
+#include <convert/utf16beucs2codecvt.hpp>
-#include <Utils/utf16leucs2codecvt.hpp>
+#include <convert/utf16leucs2codecvt.hpp>
 
 #include <fstream>
 std::ifstream inputFile;

include/Utils/StringAdaptor.hpp

@@ -7,7 +7,7 @@
 #include <SAX/ArabicaConfig.hpp>
 #include <string>
 #include <Utils/convertstream.hpp>
-#include <Utils/utf8ucs2codecvt.hpp>
+#include <convert/utf8ucs2codecvt.hpp>
 #include <Utils/stringadaptortag.hpp>
 
 namespace Arabica

src/Makefile.am

@@ -1,18 +1,18 @@
 
 cc_sources = arabica.cpp \
 	SAX/helpers/InputSourceResolver.cpp \
-	Utils/base64codecvt.cpp \
+	convert/base64codecvt.cpp \
-	Utils/impl/iso88591_utf8.cpp \
+	convert/impl/iso88591_utf8.cpp \
-	Utils/impl/ucs2_utf16.cpp \
+	convert/impl/ucs2_utf16.cpp \
-	Utils/impl/ucs2_utf8.cpp \
+	convert/impl/ucs2_utf8.cpp \
-	Utils/iso88591utf8codecvt.cpp \
+	convert/iso88591utf8codecvt.cpp \
-	Utils/rot13codecvt.cpp \
+	convert/rot13codecvt.cpp \
-	Utils/ucs2utf8codecvt.cpp \
+	convert/ucs2utf8codecvt.cpp \
-	Utils/utf16beucs2codecvt.cpp \
+	convert/utf16beucs2codecvt.cpp \
-	Utils/utf16leucs2codecvt.cpp \
+	convert/utf16leucs2codecvt.cpp \
-	Utils/utf16utf8codecvt.cpp \
+	convert/utf16utf8codecvt.cpp \
-	Utils/utf8iso88591codecvt.cpp \
+	convert/utf8iso88591codecvt.cpp \
-	Utils/utf8ucs2codecvt.cpp \
+	convert/utf8ucs2codecvt.cpp \
         io/uri.cpp \
 	XML/XMLCharacterClasses.cpp
 

src/arabica.cpp

@@ -40,7 +40,7 @@
 #endif
 
 #ifndef ARABICA_NO_CODECVT_SPECIALISATIONS
-#include "Utils/impl/codecvt_specialisations.cpp"
+#include "convert/impl/codecvt_specialisations.cpp"
 #endif 
 
 #ifdef __GNUWIN32__

src/convert/base64codecvt.cpp

@@ -4,7 +4,7 @@
 //
 ///////////////////////////////////////////
 
-#include <Utils/base64codecvt.hpp>
+#include <convert/base64codecvt.hpp>
 
 static const std::string base64_charset("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
 static const int NO_MORE = 256;

src/convert/impl/codecvt_specialisations.cpp

@@ -1,4 +1,4 @@
 
-#include <Utils/impl/codecvt_specialisations.hpp>
+#include <convert/impl/codecvt_specialisations.hpp>
 
 std::locale::id std::codecvt<char, wchar_t, std::mbstate_t>::id;

src/convert/impl/iso88591_utf8.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/impl/iso88591_utf8.hpp>
+#include <convert/impl/iso88591_utf8.hpp>
 //---------------------------------------------------------------------------
 // Some of this code is derived from work done by Ken Thompson,
 // provided to the X/Open Group.

src/convert/impl/ucs2_utf16.cpp

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
-#include <Utils/impl/ucs2_utf16.hpp>
+#include <convert/impl/ucs2_utf16.hpp>
 // --------------------------------------------------------------------------
 std::codecvt_base::result Arabica::Internal::utf16_2_ucs2(bool be,
                        char const* from, char const* from_end, char const*& from_next,

src/convert/impl/ucs2_utf8.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/impl/ucs2_utf8.hpp>
+#include <convert/impl/ucs2_utf8.hpp>
 //---------------------------------------------------------------------------
 // Some of this code is derived from work done by Ken Thompson,
 // provided to the X/Open Group.

src/convert/iso88591utf8codecvt.cpp

@@ -1,8 +1,8 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/iso88591utf8codecvt.hpp>
+#include <convert/iso88591utf8codecvt.hpp>
-#include <Utils/impl/iso88591_utf8.hpp>
+#include <convert/impl/iso88591_utf8.hpp>
 //---------------------------------------------------------------------------
 // This facet converts from ISO8859:1 (Latin 1) chars to UTF-8 encoded chars.
 using namespace Arabica::convert;

src/convert/rot13codecvt.cpp

@@ -4,7 +4,7 @@
 //
 ///////////////////////////////////////////
 
-#include <Utils/rot13codecvt.hpp>
+#include <convert/rot13codecvt.hpp>
 #ifdef ARABICA_VS6_WORKAROUND
 #include <Utils/impl/VS6Workaround.hpp>
 #endif

src/convert/ucs2utf8codecvt.cpp

@@ -1,8 +1,8 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/ucs2utf8codecvt.hpp>
+#include <convert/ucs2utf8codecvt.hpp>
-#include <Utils/impl/ucs2_utf8.hpp>
+#include <convert/impl/ucs2_utf8.hpp>
 //---------------------------------------------------------------------------
 // This facet converts from wide chars to char using the
 // FSS-UTF (UCS2) encoding.

src/convert/utf16beucs2codecvt.cpp

@@ -1,9 +1,9 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/utf16beucs2codecvt.hpp>
+#include <convert/utf16beucs2codecvt.hpp>
 #ifndef ARABICA_NO_WCHAR_T
-#include <Utils/impl/ucs2_utf16.hpp>
+#include <convert/impl/ucs2_utf16.hpp>
 
 #ifdef ARABICA_VS6_WORKAROUND
 #include <Utils/impl/VS6Workaround.hpp>

src/convert/utf16leucs2codecvt.cpp

@@ -1,9 +1,9 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/utf16leucs2codecvt.hpp>
+#include <convert/utf16leucs2codecvt.hpp>
 #ifndef ARABICA_NO_WCHAR_T
-#include <Utils/impl/ucs2_utf16.hpp>
+#include <convert/impl/ucs2_utf16.hpp>
 
 #ifdef ARABICA_VS6_WORKAROUND
 #include <Utils/impl/VS6Workaround.hpp>

src/convert/utf16utf8codecvt.cpp

@@ -1,8 +1,8 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/utf16utf8codecvt.hpp>
+#include <convert/utf16utf8codecvt.hpp>
-#include <Utils/impl/ucs2_utf8.hpp>
+#include <convert/impl/ucs2_utf8.hpp>
 //---------------------------------------------------------------------------
 // This facet converts from wide chars to char using the
 // FSS-UTF (UCS2) encoding.

src/convert/utf8iso88591codecvt.cpp

@@ -1,8 +1,8 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/utf8iso88591codecvt.hpp>
+#include <convert/utf8iso88591codecvt.hpp>
-#include <Utils/impl/iso88591_utf8.hpp>
+#include <convert/impl/iso88591_utf8.hpp>
 //---------------------------------------------------------------------------
 // This facet converts from ISO8859:1 (Latin 1) chars to UTF-8 encoded chars.
 

src/convert/utf8ucs2codecvt.cpp

@@ -1,9 +1,9 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
-#include <Utils/utf8ucs2codecvt.hpp>
+#include <convert/utf8ucs2codecvt.hpp>
-#include <Utils/impl/ucs2_utf16.hpp>
+#include <convert/impl/ucs2_utf16.hpp>
-#include <Utils/impl/ucs2_utf8.hpp>
+#include <convert/impl/ucs2_utf8.hpp>
 //---------------------------------------------------------------------------
 #ifndef ARABICA_NO_WCHAR_T
 

tests/Utils/test_base64.hpp

@@ -1,7 +1,7 @@
 #ifndef UTILS_BASE64_TEST_HPP
 #define UTILS_BASE64_TEST_HPP
 
-#include <Utils/base64codecvt.hpp>
+#include <convert/base64codecvt.hpp>
 
 #ifdef _MSC_VER
 #pragma warning(disable: 4244)

vs8/lib_arabica.vcproj

@@ -774,10 +774,6 @@
 			<Filter
 				Name="Utils"
 				>
-				<File
-					RelativePath="..\include\Utils\base64codecvt.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\include\Utils\impl\codecvt_specialisations.hpp"
 					>
@@ -794,26 +790,10 @@
 					RelativePath="..\include\Utils\getparam.hpp"
 					>
 				</File>
-				<File
-					RelativePath="..\include\Utils\impl\iso88591_utf8.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\iso88591utf8codecvt.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\include\Utils\normalize_whitespace.hpp"
 					>
 				</File>
-				<File
-					RelativePath="..\include\Utils\rot13codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\socket_stream.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\include\Utils\StringAdaptor.hpp"
 					>
@@ -822,38 +802,6 @@
 					RelativePath="..\include\Utils\stringadaptortag.hpp"
 					>
 				</File>
-				<File
-					RelativePath="..\include\Utils\impl\ucs2_utf16.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\impl\ucs2_utf8.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\ucs2utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf16beucs2codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf16leucs2codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf16utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf8iso88591codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf8ucs2codecvt.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\include\Utils\impl\VS6Workaround.hpp"
 					>
@@ -878,11 +826,71 @@
 			<Filter
 				Name="io"
 				>
+				<File
+					RelativePath="..\include\io\socket_stream.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\include\io\uri.hpp"
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="convert"
+				>
+				<File
+					RelativePath="..\include\convert\base64codecvt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\impl\codecvt_specialisations.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\impl\iso88591_utf8.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\iso88591utf8codecvt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\rot13codecvt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\impl\ucs2_utf16.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\impl\ucs2_utf8.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\ucs2utf8codecvt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\utf16beucs2codecvt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\utf16leucs2codecvt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\utf16utf8codecvt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\utf8iso88591codecvt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\convert\utf8ucs2codecvt.hpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="src"
@@ -916,62 +924,10 @@
 			<Filter
 				Name="Utils"
 				>
-				<File
-					RelativePath="..\src\Utils\base64codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\iso88591utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\rot13codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\ucs2utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf16beucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf16leucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf16utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf8iso88591codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf8ucs2codecvt.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\src\XML\XMLCharacterClasses.cpp"
 					>
 				</File>
-				<Filter
-					Name="impl"
-					>
-					<File
-						RelativePath="..\src\Utils\impl\iso88591_utf8.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\Utils\impl\ucs2_utf16.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\Utils\impl\ucs2_utf8.cpp"
-						>
-					</File>
-				</Filter>
 			</Filter>
 			<Filter
 				Name="SAX"
@@ -993,6 +949,58 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="convert"
+				>
+				<File
+					RelativePath="..\src\convert\base64codecvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\impl\iso88591_utf8.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\iso88591utf8codecvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\rot13codecvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\impl\ucs2_utf16.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\impl\ucs2_utf8.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\ucs2utf8codecvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\utf16beucs2codecvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\utf16leucs2codecvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\utf16utf8codecvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\utf8iso88591codecvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\convert\utf8ucs2codecvt.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>