Remove string namespace

engine/compilers/bundle_compiler.cpp

@@ -117,7 +117,7 @@ void BundleCompiler::scan(const char* cur_dir, Vector<DynamicString>& files)
 	{
 		DynamicString file_i(default_allocator());
 
-		if (string::strcmp(cur_dir, "") != 0)
+		if (strcmp(cur_dir, "") != 0)
 		{
 			file_i += cur_dir;
 			file_i += '/';

engine/console_server.cpp

@@ -92,7 +92,7 @@ void ConsoleServer::log_to_all(LogSeverity::Enum severity, const char* message,
 	buf[len] = '\n';
 	buf[len + 1] = '\0';
 
-	for (uint32_t i = 0; i < string::strlen(message); i++)
+	for (uint32_t i = 0; i < strlen(message); i++)
 	{
 		if (buf[i] == '"')
 			buf[i] = '\'';
@@ -122,7 +122,7 @@ void ConsoleServer::log_to_all(LogSeverity::Enum severity, const char* message,
 
 void ConsoleServer::send(TCPSocket client, const char* json)
 {
-	uint32_t len = string::strlen(json);
+	uint32_t len = strlen(json);
 	client.write((const char*)&len, 4);
 	client.write(json, len);
 }
@@ -275,8 +275,8 @@ void ConsoleServer::process_command(TCPSocket /*client*/, const char* msg)
 
 		char t[256];
 		char n[256];
-		string::strncpy(t, resource_type.c_str(), 256);
-		string::strncpy(n, resource_name.c_str(), 256);
+		strncpy(t, resource_type.c_str(), 256);
+		strncpy(n, resource_name.c_str(), 256);
 		device()->reload(t, n);
 	}
 	else if (cmd == "pause")

engine/core/command_line.h

@@ -44,8 +44,8 @@ struct CommandLine
 	{
 		for (int i = 0; i < _argc; i++)
 		{
-			if ((shortopt != '\0' && string::strlen(_argv[i]) > 1 && _argv[i][0] == '-' && _argv[i][1] == shortopt) ||
-				(string::strlen(_argv[i]) > 2 && _argv[i][0] == '-' && _argv[i][1] == '-' && string::strcmp(&_argv[i][2], longopt) == 0))
+			if ((shortopt != '\0' && strlen(_argv[i]) > 1 && _argv[i][0] == '-' && _argv[i][1] == shortopt) ||
+				(strlen(_argv[i]) > 2 && _argv[i][0] == '-' && _argv[i][1] == '-' && strcmp(&_argv[i][2], longopt) == 0))
 			{
 				return i;
 			}

engine/core/filesystem/disk_filesystem.cpp

@@ -41,7 +41,7 @@ DiskFilesystem::DiskFilesystem()
 DiskFilesystem::DiskFilesystem(const char* root_path)
 {
 	CE_ASSERT_NOT_NULL(root_path);
-	string::strncpy(_root_path, root_path, MAX_PATH_LENGTH);
+	strncpy(_root_path, root_path, MAX_PATH_LENGTH);
 }
 
 File* DiskFilesystem::open(const char* path, FileOpenMode mode)

engine/core/filesystem/network_file.cpp

@@ -45,7 +45,7 @@ NetworkFile::NetworkFile(const NetAddress& addr, uint16_t port, const char* file
 	, _port(port)
 	, _position(0)
 {
-	string::strncpy(_filename, filename, MAX_PATH_LENGTH);
+	strncpy(_filename, filename, MAX_PATH_LENGTH);
 	_socket.connect(addr, port);
 }
 

engine/core/filesystem/network_filesystem.h

@@ -50,7 +50,7 @@ namespace network_filesystem
 
 	inline void send(TCPSocket socket, const char* msg)
 	{
-		uint32_t msg_len = string::strlen(msg);
+		uint32_t msg_len = strlen(msg);
 		socket.write(&msg_len, 4);
 		socket.write(msg, msg_len);
 	}

engine/core/filesystem/reader_writer.h

@@ -92,7 +92,7 @@ public:
 	/// The final null character is not copied to the file.
 	void write_string(const char* string)
 	{
-		_file.write(string, string::strlen(string));
+		_file.write(string, strlen(string));
 	}
 
 private:

engine/core/json/json.cpp

@@ -341,7 +341,7 @@ namespace json
 		// Ensure null terminated
 		array::push_back(str, '\0');
 
-		return string::parse_double(array::begin(str));
+		return parse_double(array::begin(str));
 	}
 
 	bool parse_bool(const char* s)

engine/core/json/json_parser.h

@@ -141,7 +141,7 @@ public:
 	/// @note Matrix4x4 = [x, x, x, x, y, y, y, y, z, z, z, z, t, t, t, t]
 	Matrix4x4 to_matrix4x4(const Matrix4x4& def = matrix4x4::IDENTITY) const;
 
-	/// Returns the string id value hashed to string::murmur2_32() of the element.
+	/// Returns the string id value hashed to murmur2_32() of the element.
 	StringId32 to_string_id(const StringId32 def = 0) const;
 
 	/// Returns the resource id value of the element.

engine/core/memory/proxy_allocator.cpp

@@ -99,7 +99,7 @@ ProxyAllocator* ProxyAllocator::find(const char* name)
 
 	while (head != NULL)
 	{
-		if (string::strcmp(name, head->name()) == 0)
+		if (strcmp(name, head->name()) == 0)
 		{
 			return head;
 		}

engine/core/os.h

@@ -114,9 +114,9 @@ namespace os
 	inline bool is_root_path(const char* path)
 	{
 #if CROWN_PLATFORM_POSIX
-		return (path != NULL && string::strlen(path) == 1 && path[0] == PATH_SEPARATOR);
+		return (path != NULL && strlen(path) == 1 && path[0] == PATH_SEPARATOR);
 #elif CROWN_PLATFORM_WINDOWS
-		return (path != NULL && string::strlen(path) == 3 && string::is_alpha(path[0]) &&
+		return (path != NULL && strlen(path) == 3 && is_alpha(path[0]) &&
 			path[1] == ':' && path[2] == PATH_SEPARATOR);
 #endif
 	}
@@ -124,9 +124,9 @@ namespace os
 	inline bool is_absolute_path(const char* path)
 	{
 #if CROWN_PLATFORM_POSIX
-		return (path != NULL && string::strlen(path) >= 1 && path[0] == PATH_SEPARATOR);
+		return (path != NULL && strlen(path) >= 1 && path[0] == PATH_SEPARATOR);
 #elif CROWN_PLATFORM_WINDOWS
-		return (path != NULL && string::strlen(path) >= 3 && string::is_alpha(path[0]) &&
+		return (path != NULL && strlen(path) >= 3 && is_alpha(path[0]) &&
 			path[1] == ':' && path[2] == PATH_SEPARATOR);
 #endif
 	}
@@ -265,8 +265,8 @@ namespace os
 
 		char cur_path[MAX_PATH_LENGTH];
 
-		string::strncpy(cur_path, path, string::strlen(path) + 1);
-		string::strncat(cur_path, "\\*", 2);
+		strncpy(cur_path, path, strlen(path) + 1);
+		strncat(cur_path, "\\*", 2);
 
 		file = FindFirstFile(cur_path, &ffd);
 
@@ -274,7 +274,7 @@ namespace os
 		{
 			CE_ASSERT(file != INVALID_HANDLE_VALUE, "Unable to list files. errono %d", GetLastError());
 
-			if ((string::strcmp(ffd.cFileName, ".") == 0) || (string::strcmp(ffd.cFileName, "..") == 0))
+			if ((strcmp(ffd.cFileName, ".") == 0) || (strcmp(ffd.cFileName, "..") == 0))
 			{
 				continue;
 			}
@@ -316,7 +316,7 @@ namespace os
 #elif CROWN_PLATFORM_WINDOWS
 		static char norm[MAX_PATH_LENGTH];
 
-		for (uint32_t i = 0; i < string::strlen(path)+1; i++)
+		for (uint32_t i = 0; i < strlen(path)+1; i++)
 		{
 			if (path[i] == '/')
 			{
@@ -443,7 +443,7 @@ namespace os
 
 		// Necessary because CreateProcess second argument must be non-const
 		char tmp[1024];
-		string::strncpy(tmp, normalize_path(cmds.c_str()), string::strlen(cmds.c_str()));
+		strncpy(tmp, normalize_path(cmds.c_str()), strlen(cmds.c_str()));
 
 		int err = CreateProcess(args[0], tmp, NULL, NULL, TRUE, 0, NULL, NULL, &info, &process);
 		CE_ASSERT(err != 0, "CreateProcess: GetLastError = %d", GetLastError());

engine/core/os_window_linux.cpp

@@ -125,7 +125,7 @@ char* OsWindow::title()
 	char* tmp_title;
 	XFetchName(m_x11_display, m_x11_window, &tmp_title);
 
-	string::strncpy(title, tmp_title, 1024);
+	strncpy(title, tmp_title, 1024);
 	XFree(tmp_title);
 
 	return title;

engine/core/os_window_windows.cpp

@@ -97,7 +97,7 @@ char* OsWindow::title()
 
 void OsWindow::set_title(const char* title)
 {
-	string::strncpy(m_title, title, 32);
+	strncpy(m_title, title, 32);
 	SetWindowText(m_windows_window, m_title);
 }
 

engine/core/settings/float_setting.cpp

@@ -104,7 +104,7 @@ FloatSetting* FloatSetting::find_setting(const char* name)
 
 	while (head != NULL)
 	{
-		if (string::strcmp(name, head->name()) == 0)
+		if (strcmp(name, head->name()) == 0)
 		{
 			return head;
 		}

engine/core/settings/int_setting.cpp

@@ -104,7 +104,7 @@ IntSetting*	IntSetting::find_setting(const char* name)
 
 	while (head != NULL)
 	{
-		if (string::strcmp(name, head->name()) == 0)
+		if (strcmp(name, head->name()) == 0)
 		{
 			return head;
 		}

engine/core/settings/string_setting.cpp

@@ -76,7 +76,7 @@ StringSetting* StringSetting::find_setting(const char* name)
 
 	while (head != NULL)
 	{
-		if (string::strcmp(name, head->name()) == 0)
+		if (strcmp(name, head->name()) == 0)
 		{
 			return head;
 		}

engine/core/strings/dynamic_string.h

@@ -79,7 +79,7 @@ public:
 	/// Returns wheterh the string ends with the given @a s string.
 	bool ends_with(const char* s) const;
 
-	/// Returns the string hashed to string::murmur2_32.
+	/// Returns the string hashed to murmur2_32.
 	StringId32 to_string_id() const;
 
 	///
@@ -101,7 +101,7 @@ inline DynamicString::DynamicString(const char* s, Allocator& allocator)
 {
 	if (s != NULL)
 	{
-		array::push(_data, s, string::strlen(s));
+		array::push(_data, s, strlen(s));
 	}
 	array::push_back(_data, '\0');
 }
@@ -119,7 +119,7 @@ inline DynamicString& DynamicString::operator+=(const char* s)
 {
 	CE_ASSERT_NOT_NULL(s);
 	array::pop_back(_data);
-	array::push(_data, s, string::strlen(s));
+	array::push(_data, s, strlen(s));
 	array::push_back(_data, '\0');
 	return *this;
 }
@@ -142,7 +142,7 @@ inline DynamicString& DynamicString::operator=(const char* s)
 {
 	CE_ASSERT_NOT_NULL(s);
 	array::clear(_data);
-	array::push(_data, s, string::strlen(s));
+	array::push(_data, s, strlen(s));
 	array::push_back(_data, '\0');
 	return *this;
 }
@@ -157,24 +157,24 @@ inline DynamicString& DynamicString::operator=(const char c)
 
 inline bool DynamicString::operator<(const DynamicString& s) const
 {
-	return string::strcmp(c_str(), s.c_str()) < 0;
+	return strcmp(c_str(), s.c_str()) < 0;
 }
 
 inline bool DynamicString::operator==(const DynamicString& s) const
 {
-	return string::strcmp(c_str(), s.c_str()) == 0;
+	return strcmp(c_str(), s.c_str()) == 0;
 }
 
 inline bool DynamicString::operator==(const char* s) const
 {
 	CE_ASSERT_NOT_NULL(s);
 
-	return string::strcmp(c_str(), s) == 0;
+	return strcmp(c_str(), s) == 0;
 }
 
 inline uint32_t DynamicString::length() const
 {
-	return string::strlen(this->c_str());
+	return strlen(this->c_str());
 }
 
 inline void DynamicString::strip_leading(const char* s)
@@ -182,8 +182,8 @@ inline void DynamicString::strip_leading(const char* s)
 	CE_ASSERT_NOT_NULL(s);
 	CE_ASSERT(starts_with(s), "String does not start with %s", s);
 
-	const size_t my_len = string::strlen(c_str());
-	const size_t s_len = string::strlen(s);
+	const size_t my_len = strlen(c_str());
+	const size_t s_len = strlen(s);
 
 	memmove(array::begin(_data), array::begin(_data) + s_len, (my_len - s_len));
 	array::resize(_data, my_len - s_len);
@@ -195,8 +195,8 @@ inline void DynamicString::strip_trailing(const char* s)
 	CE_ASSERT_NOT_NULL(s);
 	CE_ASSERT(ends_with(s), "String does not end with %s", s);
 
-	const size_t my_len = string::strlen(c_str());
-	const size_t s_len = string::strlen(s);
+	const size_t my_len = strlen(c_str());
+	const size_t s_len = strlen(s);
 	array::resize(_data, my_len - s_len);
 	array::push_back(_data, '\0');
 }
@@ -204,19 +204,19 @@ inline void DynamicString::strip_trailing(const char* s)
 inline bool DynamicString::starts_with(const char* s) const
 {
 	CE_ASSERT_NOT_NULL(s);
-	return string::strncmp(c_str(), s, string::strlen(s)) == 0;
+	return strncmp(c_str(), s, strlen(s)) == 0;
 }
 
 inline bool DynamicString::ends_with(const char* s) const
 {
 	CE_ASSERT_NOT_NULL(s);
 
-	const size_t my_len = string::strlen(c_str());
-	const size_t s_len = string::strlen(s);
+	const size_t my_len = strlen(c_str());
+	const size_t s_len = strlen(s);
 
 	if (my_len >= s_len)
 	{
-		return string::strncmp(array::begin(_data) + (my_len - s_len), s, s_len) == 0;
+		return strncmp(array::begin(_data) + (my_len - s_len), s, s_len) == 0;
 	}
 
 	return false;
@@ -224,7 +224,7 @@ inline bool DynamicString::ends_with(const char* s) const
 
 inline StringId32 DynamicString::to_string_id() const
 {
-	return string::murmur2_32(c_str(), length());
+	return murmur2_32(c_str(), length());
 }
 
 inline const char* DynamicString::c_str() const

engine/core/strings/path.cpp

@@ -34,7 +34,7 @@ namespace path
 	{
 		CE_ASSERT(segment != NULL, "Segment must be != NULL");
 
-		size_t segment_len = string::strlen(segment);
+		size_t segment_len = strlen(segment);
 
 		// Empty segment is not valid
 		if (segment_len == 0)
@@ -77,7 +77,7 @@ namespace path
 	bool is_valid_path(const char* path)
 	{
 		(void)path;
-	//	size_t path_len = string::strlen(path);
+	//	size_t path_len = strlen(path);
 
 	//	if (pathLen == 0)
 	//	{
@@ -125,15 +125,15 @@ namespace path
 		CE_ASSERT(path != NULL, "Path must be != NULL");
 		CE_ASSERT(str != NULL, "Str must be != NULL");
 
-		const char* last_separator = string::find_last(path, '/');
+		const char* last_separator = find_last(path, '/');
 
-		if (last_separator == string::end(path))
+		if (last_separator == end(path))
 		{
-			string::strncpy(str, "", len);
+			strncpy(str, "", len);
 		}
 		else
 		{
-			string::substring(string::begin(path), last_separator, str, len);
+			substring(begin(path), last_separator, str, len);
 		}
 	}
 
@@ -150,15 +150,15 @@ namespace path
 		CE_ASSERT(path != NULL, "Path must be != NULL");
 		CE_ASSERT(str != NULL, "Str must be != NULL");
 
-		const char* last_separator = string::find_last(path, '/');
+		const char* last_separator = find_last(path, '/');
 
-		if (last_separator == string::end(path))
+		if (last_separator == end(path))
 		{
-			string::strncpy(str, "", len);
+			strncpy(str, "", len);
 		}
 		else
 		{
-			string::substring(last_separator + 1, string::end(path), str, len);
+			substring(last_separator + 1, end(path), str, len);
 		}
 	}
 
@@ -174,24 +174,24 @@ namespace path
 		CE_ASSERT(path != NULL, "Path must be != NULL");
 		CE_ASSERT(str != NULL, "Str must be != NULL");
 
-		const char* last_separator = string::find_last(path, '/');
-		const char* last_dot = string::find_last(path, '.');
+		const char* last_separator = find_last(path, '/');
+		const char* last_dot = find_last(path, '.');
 
-		if (last_separator == string::end(path) && last_dot != string::end(path))
+		if (last_separator == end(path) && last_dot != end(path))
 		{
-			string::substring(string::begin(path), last_dot, str, len);
+			substring(begin(path), last_dot, str, len);
 		}
-		else if (last_separator != string::end(path) && last_dot == string::end(path))
+		else if (last_separator != end(path) && last_dot == end(path))
 		{
-			string::substring(last_separator + 1, string::end(path), str, len);
+			substring(last_separator + 1, end(path), str, len);
 		}
-		else if (last_separator == string::end(path) && last_dot == string::end(path))
+		else if (last_separator == end(path) && last_dot == end(path))
 		{
-			string::strncpy(str, path, len);
+			strncpy(str, path, len);
 		}
 		else
 		{
-			string::substring(last_separator + 1, last_dot, str, len);
+			substring(last_separator + 1, last_dot, str, len);
 		}
 	}
 
@@ -206,15 +206,15 @@ namespace path
 		CE_ASSERT(path != NULL, "Path must be != NULL");
 		CE_ASSERT(str != NULL, "Str must be != NULL");
 
-		const char* last_dot = string::find_last(path, '.');
+		const char* last_dot = find_last(path, '.');
 
-		if (last_dot == string::end(path))
+		if (last_dot == end(path))
 		{
-			string::strncpy(str, "", len);
+			strncpy(str, "", len);
 		}
 		else
 		{
-			string::substring(last_dot + 1, string::end(path), str, len);
+			substring(last_dot + 1, end(path), str, len);
 		}
 	}
 
@@ -229,9 +229,9 @@ namespace path
 		CE_ASSERT(path != NULL, "Path must be != NULL");
 		CE_ASSERT(str != NULL, "Str must be != NULL");
 
-		const char* last_dot = string::find_last(path, '.');
+		const char* last_dot = find_last(path, '.');
 
-		string::substring(string::begin(path), last_dot, str, len);
+		substring(begin(path), last_dot, str, len);
 	}
 
 	/// Returns the segments contained in path.
@@ -258,15 +258,15 @@ namespace path
 		CE_ASSERT(path != NULL, "Path must be != NULL");
 		CE_ASSERT(str != NULL, "Str must be != NULL");
 
-		size_t path_len = string::strlen(path);
+		size_t path_len = strlen(path);
 
 		if (path[path_len - 1] == '/')
 		{
-			string::substring(string::begin(path), string::end(path) - 2, str, len);
+			substring(begin(path), end(path) - 2, str, len);
 		}
 		else
 		{
-			string::substring(string::begin(path), string::end(path), str, len);
+			substring(begin(path), end(path), str, len);
 		}
 	}
 } // namespace path

engine/core/strings/string_stream.h

@@ -104,7 +104,7 @@ namespace string_stream
 
 	inline StringStream& operator<<(StringStream& s, const char* string)
 	{
-		array::push(s, string, string::strlen(string));
+		array::push(s, string, strlen(string));
 		return s;
 	}
 

engine/core/strings/string_utils.h

@@ -36,8 +36,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 namespace crown
 {
-namespace string
-{
 
 inline bool is_alpha(char c)
 {
@@ -113,16 +111,16 @@ inline const char* end(const char* str)
 {
 	CE_ASSERT(str != NULL, "Str must be != NULL");
 
-	return str + string::strlen(str) + 1;
+	return str + strlen(str) + 1;
 }
 
 inline const char* find_first(const char* str, char c)
 {
 	CE_ASSERT(str != NULL, "Str must be != NULL");
 
-	const char* str_begin = string::begin(str);
+	const char* str_begin = begin(str);
 
-	while (str_begin != string::end(str))
+	while (str_begin != end(str))
 	{
 		if ((*str_begin) == c)
 		{
@@ -132,16 +130,16 @@ inline const char* find_first(const char* str, char c)
 		str_begin++;
 	}
 
-	return string::end(str);
+	return end(str);
 }
 
 inline const char* find_last(const char* str, char c)
 {
 	CE_ASSERT(str != NULL, "Str must be != NULL");
 
-	const char* str_end = string::end(str) - 1;
+	const char* str_end = end(str) - 1;
 
-	while (str_end != string::begin(str) - 1)
+	while (str_end != begin(str) - 1)
 	{
 		if ((*str_end) == c)
 		{
@@ -151,7 +149,7 @@ inline const char* find_last(const char* str, char c)
 		str_end--;
 	}
 
-	return string::end(str);
+	return end(str);
 }
 
 inline void substring(const char* begin, const char* end, char* out, size_t len)
@@ -327,13 +325,13 @@ inline uint64_t murmur2_64(const void* key, int len, uint64_t seed = 0)
 #ifdef CROWN_DEBUG
 	inline uint32_t HASH32(const char *s, uint32_t value)
 	{
-		CE_ASSERT(murmur2_32(s, string::strlen(s), 0) == value, "Hash mismatch");
+		CE_ASSERT(murmur2_32(s, strlen(s), 0) == value, "Hash mismatch");
 		return value;
 	}
 
 	inline uint64_t HASH64(const char* s, uint64_t value)
 	{
-		CE_ASSERT(murmur2_64(s, string::strlen(s), 0) == value, "Hash mismatch");
+		CE_ASSERT(murmur2_64(s, strlen(s), 0) == value, "Hash mismatch");
 		return value;
 	}
 #else
@@ -341,6 +339,4 @@ inline uint64_t murmur2_64(const void* key, int len, uint64_t seed = 0)
 	#define HASH64(s, v) (v)
 #endif
 
-} // namespace string
 } // namespace crown
-

engine/crown.cpp

@@ -66,7 +66,7 @@ static Platform::Enum string_to_platform(const char* platform)
 {
 	for (uint32_t i = 0; platform != NULL && i < Platform::COUNT; i++)
 	{
-		if (string::strcmp(platform, s_platform[i].name) == 0)
+		if (strcmp(platform, s_platform[i].name) == 0)
 			return s_platform[i].target;
 	}
 	return Platform::COUNT;
@@ -136,7 +136,7 @@ void parse_command_line(int argc, char** argv, ConfigSettings& cs)
 		exit(EXIT_FAILURE);
 	}
 
-	if (string::strcmp(cs.source_dir, cs.bundle_dir) == 0)
+	if (strcmp(cs.source_dir, cs.bundle_dir) == 0)
 	{
 		help("Source and Bundle directories must differ.");
 		exit(EXIT_FAILURE);
@@ -158,7 +158,7 @@ void parse_command_line(int argc, char** argv, ConfigSettings& cs)
 	const char* parent = cmd.get_parameter("parent-window");
 	if (parent)
 	{
-		cs.parent_window = string::parse_uint(parent);
+		cs.parent_window = parse_uint(parent);
 	}
 }
 

engine/lua/lua_system.cpp

@@ -173,17 +173,17 @@ namespace lua_globals
 		Vector3& v = stack.get_vector3(1);
 		const char* s = stack.get_string(2);
 
-		if (string::strcmp(s, "x") == 0)
+		if (strcmp(s, "x") == 0)
 		{
 			stack.push_float(v.x);
 			return 1;
 		}
-		else if (string::strcmp(s, "y") == 0)
+		else if (strcmp(s, "y") == 0)
 		{
 			stack.push_float(v.y);
 			return 1;
 		}
-		else if (string::strcmp(s, "z") == 0)
+		else if (strcmp(s, "z") == 0)
 		{
 			stack.push_float(v.z);
 			return 1;
@@ -199,9 +199,9 @@ namespace lua_globals
 		const char* s = stack.get_string(2);
 		const float value = stack.get_float(3);
 
-		if (string::strcmp(s, "x") == 0) v.x = value;
-		else if (string::strcmp(s, "y") == 0) v.y = value;
-		else if (string::strcmp(s, "z") == 0) v.z = value;
+		if (strcmp(s, "x") == 0) v.x = value;
+		else if (strcmp(s, "y") == 0) v.y = value;
+		else if (strcmp(s, "z") == 0) v.z = value;
 
 		return 0;
 	}

engine/lua/lua_vector3_box.cpp

@@ -67,17 +67,17 @@ static int vector3box_get_value(lua_State* L)
 	Vector3& v = stack.get_vector3box(1);
 	const char* s = stack.get_string(2);
 
-	if (string::strcmp(s, "x") == 0)
+	if (strcmp(s, "x") == 0)
 	{
 		stack.push_float(v.x);
 		return 1;
 	}
-	else if (string::strcmp(s, "y") == 0)
+	else if (strcmp(s, "y") == 0)
 	{
 		stack.push_float(v.y);
 		return 1;
 	}
-	else if (string::strcmp(s, "z") == 0)
+	else if (strcmp(s, "z") == 0)
 	{
 		stack.push_float(v.z);
 		return 1;
@@ -95,15 +95,15 @@ static int vector3box_set_value(lua_State* L)
 	const char* s = stack.get_string(2);
 	float value = stack.get_float(3);
 
-	if (string::strcmp(s, "x") == 0)
+	if (strcmp(s, "x") == 0)
 	{
 		v.x = value;
 	}
-	else if (string::strcmp(s, "y") == 0)
+	else if (strcmp(s, "y") == 0)
 	{
 		v.y = value;
 	}
-	else if (string::strcmp(s, "z") == 0)
+	else if (strcmp(s, "z") == 0)
 	{
 		v.z = value;
 	}

engine/physics/actor.cpp

@@ -332,7 +332,7 @@ void Actor::disable_collision()
 
 void Actor::set_collision_filter(const char* name)
 {
-	set_collision_filter(string::murmur2_32(name, string::strlen(name)));
+	set_collision_filter(murmur2_32(name, strlen(name)));
 }
 
 void Actor::set_collision_filter(StringId32 filter)

engine/renderers/gui.cpp

@@ -239,7 +239,7 @@ void Gui::draw_text(const char* str, const char* font, uint32_t font_size, const
 	// Vector2 m_pen;
 
 	// const float scale = ((float)font_size / (float)resource->font_size());
-	// const uint32_t str_len = string::strlen(str);
+	// const uint32_t str_len = strlen(str);
 
 	// TransientVertexBuffer vb;
 	// TransientIndexBuffer ib;

engine/resource/material_resource.cpp

@@ -104,7 +104,7 @@ namespace material_resource
 	{
 		for (uint32_t i = 0; i < UniformType::COUNT; i++)
 		{
-			if (string::strcmp(str, s_uniform_type_info[i].name) == 0)
+			if (strcmp(str, s_uniform_type_info[i].name) == 0)
 				return s_uniform_type_info[i].type;
 		}
 
@@ -319,7 +319,7 @@ namespace material_resource
 		for (uint32_t i = 0; i < num; i++)
 		{
 			const char* name = get_uniform_name(mr, (const UniformData*)base->name_offset);
-			if (string::strcmp(name, str) == 0)
+			if (strcmp(name, str) == 0)
 				return base;
 
 			base++;

engine/resource/physics_resource.cpp

@@ -73,7 +73,7 @@ namespace physics_resource
 	{
 		for (uint32_t i = 0; i < PhysicsShapeType::COUNT; i++)
 		{
-			if (string::strcmp(type, s_shape[i].name) == 0)
+			if (strcmp(type, s_shape[i].name) == 0)
 				return s_shape[i].type;
 		}
 
@@ -85,7 +85,7 @@ namespace physics_resource
 	{
 		for (uint32_t i = 0; i < PhysicsJointType::COUNT; i++)
 		{
-			if (string::strcmp(type, s_joint[i].name) == 0)
+			if (strcmp(type, s_joint[i].name) == 0)
 				return s_joint[i].type;
 		}
 

engine/resource/resource_manager.cpp

@@ -40,8 +40,8 @@ namespace crown
 {
 
 ResourceId::ResourceId(const char* type, const char* name)
-	: type(string::murmur2_64(type, string::strlen(type), 0))
-	, name(string::murmur2_64(name, string::strlen(name), 0))
+	: type(murmur2_64(type, strlen(type), 0))
+	, name(murmur2_64(name, strlen(name), 0))
 {
 }
 

engine/resource/unit_resource.cpp

@@ -61,7 +61,7 @@ namespace unit_resource
 	{
 		for (uint32_t i = 0; i < ProjectionType::COUNT; i++)
 		{
-			if (string::strcmp(name, s_projection[i].name) == 0)
+			if (strcmp(name, s_projection[i].name) == 0)
 				return s_projection[i].type;
 		}
 
@@ -151,14 +151,14 @@ namespace unit_resource
 			JSONElement node = e.key(node_name);
 
 			GraphNode gn;
-			gn.name = string::murmur2_32(node_name, string::strlen(node_name));
+			gn.name = murmur2_32(node_name, strlen(node_name));
 			gn.parent = NO_PARENT;
 
 			if (!node.key("parent").is_nil())
 			{
 				DynamicString parent_name;
 				node.key("parent").to_string(parent_name);
-				gn.parent = string::murmur2_32(parent_name.c_str(), parent_name.length(), 0);
+				gn.parent = murmur2_32(parent_name.c_str(), parent_name.length(), 0);
 			}
 
 			JSONElement pos = node.key("position");
@@ -193,10 +193,10 @@ namespace unit_resource
 			DynamicString camera_type;
 			type.to_string(camera_type);
 
-			StringId32 node_name_hash = string::murmur2_32(node_name.c_str(), node_name.length());
+			StringId32 node_name_hash = murmur2_32(node_name.c_str(), node_name.length());
 
 			UnitCamera cn;
-			cn.name = string::murmur2_32(camera_name, string::strlen(camera_name));
+			cn.name = murmur2_32(camera_name, strlen(camera_name));
 			cn.node = find_node_index(node_name_hash, node_depths);
 			cn.type = projection_name_to_enum(camera_type.c_str());
 			cn.fov =  camera.key_or_nil("fov").to_float(16.0f / 9.0f);
@@ -218,10 +218,10 @@ namespace unit_resource
 			JSONElement renderable = e.key(renderable_name);
 
 			DynamicString node_name; renderable.key("node").to_string(node_name);
-			StringId32 node_name_hash = string::murmur2_32(node_name.c_str(), node_name.length(), 0);
+			StringId32 node_name_hash = murmur2_32(node_name.c_str(), node_name.length(), 0);
 
 			UnitRenderable rn;
-			rn.name = string::murmur2_32(renderable_name, string::strlen(renderable_name), 0);
+			rn.name = murmur2_32(renderable_name, strlen(renderable_name), 0);
 			rn.node = find_node_index(node_name_hash, node_depths);
 			rn.visible = renderable.key("visible").to_bool();
 
@@ -258,7 +258,7 @@ namespace unit_resource
 			JSONElement value = e.key(key);
 
 			Key out_key;
-			out_key.name = string::murmur2_32(key, string::strlen(key));
+			out_key.name = murmur2_32(key, strlen(key));
 			out_key.offset = array::size(values);
 
 			if (value.is_bool()) out_key.type = ValueType::BOOL;
@@ -287,7 +287,7 @@ namespace unit_resource
 				{
 					DynamicString val;
 					value.to_string(val);
-					StringId32 val_hash = string::murmur2_32(val.c_str(), val.length());
+					StringId32 val_hash = murmur2_32(val.c_str(), val.length());
 					array::push(values, (char*) &val_hash, sizeof(StringId32));
 					break;
 				}
@@ -564,7 +564,7 @@ namespace unit_resource
 
 		for (uint32_t i = 0; i < nk; i++)
 		{
-			if (begin[i].name == string::murmur2_32(k, string::strlen(k)))
+			if (begin[i].name == murmur2_32(k, strlen(k)))
 			{
 				return true;
 			}
@@ -580,7 +580,7 @@ namespace unit_resource
 
 		for (uint32_t i = 0; i < nk; i++)
 		{
-			if (begin[i].name == string::murmur2_32(k, string::strlen(k)))
+			if (begin[i].name == murmur2_32(k, strlen(k)))
 			{
 				out_k = begin[i];
 				return true;

engine/world/scene_graph.cpp

@@ -95,7 +95,7 @@ void SceneGraph::destroy()
 
 int32_t SceneGraph::node(const char* name) const
 {
-	return node(string::murmur2_32(name, string::strlen(name)));
+	return node(murmur2_32(name, strlen(name)));
 }
 
 int32_t SceneGraph::node(StringId32 name) const
@@ -114,7 +114,7 @@ int32_t SceneGraph::node(StringId32 name) const
 
 bool SceneGraph::has_node(const char* name) const
 {
-	StringId32 name_hash = string::murmur2_32(name, string::strlen(name), 0);
+	StringId32 name_hash = murmur2_32(name, strlen(name), 0);
 
 	for (uint32_t i = 0; i < m_num_nodes; i++)
 	{

engine/world/unit.cpp

@@ -165,7 +165,7 @@ void Unit::create_renderable_objects()
 	for (uint32_t i = 0; i < num_materials(m_resource); i++)
 	{
 		const UnitMaterial* mat = get_material(m_resource, i);
-		add_material(string::murmur2_32("default", string::strlen("default"), 0), material_manager::get()->create_material(mat->id));
+		add_material(murmur2_32("default", strlen("default"), 0), material_manager::get()->create_material(mat->id));
 	}
 
 	// Create renderables
@@ -336,7 +336,7 @@ void Unit::add_component(StringId32 name, Id component, uint32_t& size, Componen
 
 Id Unit::find_component(const char* name, uint32_t size, Component* array)
 {
-	const uint32_t name_hash = string::murmur2_32(name, string::strlen(name), 0);
+	const uint32_t name_hash = murmur2_32(name, strlen(name), 0);
 	return find_component_by_name(name_hash, size, array);
 }
 
@@ -498,7 +498,7 @@ bool Unit::is_a(const char* name)
 void Unit::play_sprite_animation(const char* name, bool loop)
 {
 	if (m_sprite_animation)
-		m_sprite_animation->play(string::murmur2_32(name, string::strlen(name), 0), loop);
+		m_sprite_animation->play(murmur2_32(name, strlen(name), 0), loop);
 }
 
 void Unit::stop_sprite_animation()
@@ -578,7 +578,7 @@ void Unit::set_key(const char* k, const char* v)
 	using namespace unit_resource;
 	Key key;
 	unit_resource::get_key(m_resource, k, key);
-	*(StringId32*)(m_values + key.offset) = string::murmur2_32(v, string::strlen(v));
+	*(StringId32*)(m_values + key.offset) = murmur2_32(v, strlen(v));
 }
 
 void Unit::set_key(const char* k, const Vector3& v)