Namespace changes.

Author: jonathanbennett73

TextEncodingDetect-C++/TextEncodingDetect/main.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright 2015 Jonathan Bennett <[email protected]>
+// Copyright 2015-2016 Jonathan Bennett <[email protected]>
 // 
 // https://www.autoitscript.com 
 //
@@ -20,7 +20,7 @@
 #include <tchar.h>
 
 #include "text_encoding_detect.h"
-using namespace AutoIt::Text;
+using namespace AutoIt::Common;
 
 
 int wmain(int argc, wchar_t* argv[])

TextEncodingDetect-C++/TextEncodingDetect/text_encoding_detect.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright 2015 Jonathan Bennett <[email protected]>
+// Copyright 2015-2016 Jonathan Bennett <[email protected]>
 // 
 // https://www.autoitscript.com 
 //
@@ -19,7 +19,7 @@
 // Includes
 #include "text_encoding_detect.h"
 
-using namespace AutoIt::Text;
+using namespace AutoIt::Common;
 
 static const unsigned char TextEncodingDetect_UTF16_BOM_LE[] = { unsigned char(0xFF), unsigned char(0xFE) };
 static const unsigned char TextEncodingDetect_UTF16_BOM_BE[] = { unsigned char(0xFE), unsigned char(0xFF) };
@@ -123,7 +123,7 @@ TextEncodingDetect::Encoding TextEncodingDetect::CheckBOM(const unsigned char *p
 // "None" if it just looks like binary data.
 ///////////////////////////////////////////////////////////////////////////////
 
-TextEncodingDetect::Encoding TextEncodingDetect::DetectEncoding(const unsigned char *pBuffer, size_t size)
+TextEncodingDetect::Encoding TextEncodingDetect::DetectEncoding(const unsigned char *pBuffer, size_t size) const
 {
 	// First check if we have a BOM and return that if so
 	Encoding encoding = CheckBOM(pBuffer, size);
@@ -165,7 +165,7 @@ TextEncodingDetect::Encoding TextEncodingDetect::DetectEncoding(const unsigned c
 // ASCII - Only data in the 0-127 range. 
 ///////////////////////////////////////////////////////////////////////////////
 
-TextEncodingDetect::Encoding TextEncodingDetect::CheckUTF8(const unsigned char *pBuffer, size_t size)
+TextEncodingDetect::Encoding TextEncodingDetect::CheckUTF8(const unsigned char *pBuffer, size_t size) const
 {
 	// UTF8 Valid sequences
 	// 0xxxxxxx  ASCII
@@ -303,7 +303,7 @@ TextEncodingDetect::Encoding TextEncodingDetect::CheckUTF16NewlineChars(const un
 // UTF16_BE_NOBOM - looks like utf16 be
 ///////////////////////////////////////////////////////////////////////////////
 
-TextEncodingDetect::Encoding TextEncodingDetect::CheckUTF16ASCII(const unsigned char *pBuffer, size_t size)
+TextEncodingDetect::Encoding TextEncodingDetect::CheckUTF16ASCII(const unsigned char *pBuffer, size_t size) const
 {
 	int num_odd_nulls = 0;
 	int num_even_nulls = 0;

TextEncodingDetect-C++/TextEncodingDetect/text_encoding_detect.h

@@ -25,7 +25,7 @@
 
 namespace AutoIt
 { 
-namespace Text
+namespace Common
 {
 	class TextEncodingDetect
 	{
@@ -46,8 +46,8 @@ namespace Text
 		TextEncodingDetect();
 		~TextEncodingDetect();
 
-		Encoding CheckBOM(const unsigned char *pBuffer, size_t size);		// Just check if there is a BOM and return 
-		Encoding DetectEncoding(const unsigned char *pBuffer, size_t size);	// Check BOM and also guess if there is no BOM
+		static Encoding CheckBOM(const unsigned char *pBuffer, size_t size);		// Just check if there is a BOM and return 
+		Encoding DetectEncoding(const unsigned char *pBuffer, size_t size) const;	// Check BOM and also guess if there is no BOM
 		static int GetBOMLengthFromEncodingMode(Encoding encoding);			// Just return the BOM length of a given mode
 
 		void SetNullSuggestsBinary(bool null_suggests_binary) { null_suggests_binary_ = null_suggests_binary; }
@@ -66,13 +66,13 @@ namespace Text
 		int		utf16_expected_null_percent_;
 		int		utf16_unexpected_null_percent_;
 
-		Encoding CheckUTF8(const unsigned char *pBuffer, size_t size);				// Check for valid UTF8 with no BOM
-		Encoding CheckUTF16NewlineChars(const unsigned char *pBuffer, size_t size);	// Check for valid UTF16 with no BOM via control chars
-		Encoding CheckUTF16ASCII(const unsigned char *pBuffer, size_t size);		// Check for valid UTF16 with no BOM via null distribution
-		bool DoesContainNulls(const unsigned char *pBuffer, size_t size);			// Check for nulls
+		Encoding CheckUTF8(const unsigned char *pBuffer, size_t size) const;				// Check for valid UTF8 with no BOM
+		static Encoding CheckUTF16NewlineChars(const unsigned char *pBuffer, size_t size);	// Check for valid UTF16 with no BOM via control chars
+		Encoding CheckUTF16ASCII(const unsigned char *pBuffer, size_t size) const;		// Check for valid UTF16 with no BOM via null distribution
+		static bool DoesContainNulls(const unsigned char *pBuffer, size_t size);			// Check for nulls
 	};
 
-} // AutoIt.Text
+} // AutoIt.Common
 } // AutoIt
 
 //////////////////////////////////////////////////////////////////////