Remove UTF submodules

Author: devshgraphicsprogramming

.gitmodules

@@ -20,12 +20,6 @@
 [submodule "3rdparty/zlib"]
 	path = 3rdparty/zlib
 	url = https://github.com/madler/zlib.git
-[submodule "3rdparty/utfcpp"]
-	path = 3rdparty/utfcpp
-	url = https://github.com/nemtrif/utfcpp.git
-[submodule "3rdparty/convertutf"]
-	path = 3rdparty/convertutf
-	url = https://github.com/plenluno/convertutf.git
 [submodule "3rdparty/libpng"]
 	path = 3rdparty/libpng
 	url = https://github.com/glennrp/libpng.git

3rdparty/CMakeLists.txt

@@ -18,8 +18,6 @@ if(NBL_UPDATE_GIT_SUBMODULE)
 	update_git_submodule(./nbl_spirv_cross)
 	update_git_submodule(./zlib)
 	update_git_submodule(./openexr)
-	update_git_submodule(./utfcpp) # TODO: remove
-	update_git_submodule(./convertutf) # TODO: remove
 	update_git_submodule(./libpng)
 	update_git_submodule(./openssl)
 	update_git_submodule(./libjpeg-turbo)
@@ -269,12 +267,6 @@ add_library(spirv_cross OBJECT
 target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
 
 
-# TODO: remove
-add_library(convert_utf OBJECT
-	convertutf/ConvertUTF.cpp
-)
-
-
 add_library(aesGladman OBJECT
 	aesGladman/aes_ni.c
 	aesGladman/aescrypt.c
@@ -350,7 +342,6 @@ set(NBL_3RDPARTY_TARGETS
 				shaderc_util
 				shaderc
 				jpeg-static
-				convert_utf
 				bzip2			
 				glslang
 				OGLCompiler 

3rdparty/convertutf

@@ -6,16 +6,21 @@
 
 namespace nbl::system
 {
-	class CStdoutLogger : public IThreadsafeLogger
-	{
+
+class CStdoutLogger : public IThreadsafeLogger
+{
+	public:
 		CStdoutLogger(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
+
+	protected:
 		virtual void threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args) override
 		{
 			printf(constructLogString(fmt, logLevel, args).data());
 			fflush(stdout);
 		}
 
-	};
+};
+
 }
 
 #endif

3rdparty/utfcpp

@@ -1,5 +1,6 @@
 #ifndef _NBL_SYSTEM_CSYSTEMWIN32_H_INCLUDED_
 #define _NBL_SYSTEM_CSYSTEMWIN32_H_INCLUDED_
+
 #ifdef _NBL_PLATFORM_WINDOWS_
 #include <windows.h>
 #include <powerbase.h>

include/nbl/system/CStdoutLogger.h

@@ -13,7 +13,6 @@
 #include <iomanip>
 #include <regex>
 #include <cstdarg>
-#include <codecvt>
 
 
 namespace nbl::system
@@ -31,10 +30,6 @@ class ILogger : public core::IReferenceCounted
 			ELL_PERFORMANCE = 8,
 			ELL_ERROR = 16
 		};
-	protected:
-		static core::bitflag<E_LOG_LEVEL> defaultLogMask();
-	public:
-		ILogger(core::bitflag<E_LOG_LEVEL> logLevelMask) : m_logLevelMask(logLevelMask) {}
 
 		void log(const std::string_view& fmtString, E_LOG_LEVEL logLevel = ELL_DEBUG, ...)
 		{
@@ -53,6 +48,10 @@ class ILogger : public core::IReferenceCounted
 		}
 
 	protected:
+		static core::bitflag<E_LOG_LEVEL> defaultLogMask();
+
+		ILogger(core::bitflag<E_LOG_LEVEL> logLevelMask) : m_logLevelMask(logLevelMask) {}
+
 		virtual void log_impl(const std::string_view& fmtString, E_LOG_LEVEL logLevel, va_list args) = 0;
 		virtual std::string constructLogString(const std::string_view& fmtString, E_LOG_LEVEL logLevel, va_list l)
 		{
@@ -106,14 +105,7 @@ class ILogger : public core::IReferenceCounted
  			return out_str;
 			return "";
 		}
-		virtual std::wstring constructLogWstring(const std::wstring_view& fmtString, E_LOG_LEVEL logLevel, va_list l)
-		{
-			std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
-			std::string narrow = converter.to_bytes(std::wstring(fmtString));
-			std::string narrowStr = constructLogString(narrow, logLevel, l);
-			std::wstring wide = converter.from_bytes(narrowStr);
-			return wide;
-		}
+
 	private:
 		core::bitflag<E_LOG_LEVEL> m_logLevelMask;
 };

include/nbl/system/CSystemWin32.h

@@ -376,8 +376,6 @@ if (NBL_EMBED_BUILTIN_RESOURCES)
 endif()
 
 set(COMMON_INCLUDE_DIRS
-	${THIRD_PARTY_SOURCE_DIR}/convertutf # TODO: remove
-	${THIRD_PARTY_SOURCE_DIR}/utfcpp/source # TODO: remove
 	${THIRD_PARTY_SOURCE_DIR}/glm
         ${THIRD_PARTY_SOURCE_DIR}/renderdoc # for renderdoc api header
 	${CMAKE_BINARY_DIR}/3rdparty/zlib #for dynamically generated zconf.h
@@ -387,10 +385,6 @@ set(COMMON_INCLUDE_DIRS
 	$<TARGET_PROPERTY:jpeg-static,BINARY_DIR> #for dynamically generated jconfig.h
 )
 
-macro(nbl_target_link_utfcpp _trgt)  # TODO: remove
-	target_include_directories(${_trgt} PUBLIC ${THIRD_PARTY_SOURCE_DIR}/utfcpp/source)
-endmacro()
-
 # TODO: Change all MACROS into FUNCTIONS (if possible, need to clarify variable scoping rules)
 macro(nbl_target_link_zlib _trgt)
 	add_dependencies(zlibstatic zlib_copy)
@@ -505,7 +499,6 @@ add_library(Nabla STATIC
 	${NABLA_HEADERS}
 	$<TARGET_OBJECTS:aesGladman>
 	$<TARGET_OBJECTS:bzip2>
-	$<TARGET_OBJECTS:convert_utf>
 	$<TARGET_OBJECTS:lz4>
 	$<TARGET_OBJECTS:lzma>
 	$<TARGET_OBJECTS:spirv_cross>