From 991d841d572211cf6dff9c8a7509e113efac47e0 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 11 May 2013 13:51:56 +0200
Subject: [PATCH] Made String(char) explicit

Former-commit-id: 02f5ead8fe60b825464f956d9fc6ea4689bda44b
---
 include/Nazara/Core/String.hpp    | 2 +-
 include/Nazara/Math/Basic.inl     | 2 +-
 src/Nazara/Core/PluginManager.cpp | 2 +-
 src/Nazara/Core/String.cpp        | 6 +++---
 src/Nazara/Core/StringStream.cpp  | 4 ++--
 src/Nazara/Utility/Mesh.cpp       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/Nazara/Core/String.hpp b/include/Nazara/Core/String.hpp
index 1b9d6d0fc..dad7becb8 100644
--- a/include/Nazara/Core/String.hpp
+++ b/include/Nazara/Core/String.hpp
@@ -32,7 +32,7 @@ class NAZARA_API NzString : public NzHashable
 		struct SharedString;
 
 		NzString();
-		NzString(char character);
+		explicit NzString(char character);
 		NzString(const char* string);
 		NzString(const std::string& string);
 		NzString(const NzString& string);
diff --git a/include/Nazara/Math/Basic.inl b/include/Nazara/Math/Basic.inl
index 0b1ee37ec..9eef7e079 100644
--- a/include/Nazara/Math/Basic.inl
+++ b/include/Nazara/Math/Basic.inl
@@ -189,7 +189,7 @@ NzString NzNumberToString(long long number, nzUInt8 radix)
 	#endif
 
 	if (number == 0)
-		return '0';
+		return NzString('0');
 
 	static const char* symbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
diff --git a/src/Nazara/Core/PluginManager.cpp b/src/Nazara/Core/PluginManager.cpp
index 24e59dffc..03859b8ea 100644
--- a/src/Nazara/Core/PluginManager.cpp
+++ b/src/Nazara/Core/PluginManager.cpp
@@ -44,7 +44,7 @@ bool NzPluginManager::AddDirectory(const NzString& directoryPath)
 
 bool NzPluginManager::Initialize()
 {
-	s_directories.push_back(NzFile::AbsolutePath('.'));
+	s_directories.push_back(NzFile::AbsolutePath("."));
 
 	NzString libDir = NzFile::AbsolutePath("lib");
 	if (NzDirectory::Exists(libDir))
diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp
index 19e909db6..040796c34 100644
--- a/src/Nazara/Core/String.cpp
+++ b/src/Nazara/Core/String.cpp
@@ -3778,7 +3778,7 @@ NzString NzString::SubstrTo(char character, int startPos, bool toLast, bool incl
 		pos = Find(character, startPos, flags);
 
 	if (pos == 0)
-		return (include) ? character : NzString();
+		return (include) ? NzString(character) : NzString();
 	else if (pos == npos)
 		return *this;
 
@@ -4903,7 +4903,7 @@ NzString operator+(char character, const NzString& string)
 		return string;
 
 	if (string.IsEmpty())
-		return character;
+		return NzString(character);
 
 	unsigned int totalSize = string.m_sharedString->size+1;
 	char* str = new char[totalSize+1];
@@ -5035,7 +5035,7 @@ bool operator<(const std::string& string, const NzString& nstring)
 
 bool operator<=(char character, const NzString& nstring)
 {
-	return !operator<(nstring, character);
+	return !operator<(nstring, NzString(character));
 }
 
 bool operator<=(const char* string, const NzString& nstring)
diff --git a/src/Nazara/Core/StringStream.cpp b/src/Nazara/Core/StringStream.cpp
index 148bdab7a..5aafd57fe 100644
--- a/src/Nazara/Core/StringStream.cpp
+++ b/src/Nazara/Core/StringStream.cpp
@@ -153,7 +153,7 @@ NzStringStream& NzStringStream::operator<<(char character)
 {
 	NazaraLock(m_mutex)
 
-	m_strings.push_back(character);
+	m_strings.push_back(NzString(character));
 	m_bufferSize++;
 
 	return *this;
@@ -163,7 +163,7 @@ NzStringStream& NzStringStream::operator<<(unsigned char character)
 {
 	NazaraLock(m_mutex)
 
-	m_strings.push_back(character);
+	m_strings.push_back(NzString(character));
 	m_bufferSize++;
 
 	return *this;
diff --git a/src/Nazara/Utility/Mesh.cpp b/src/Nazara/Utility/Mesh.cpp
index af2f5617f..8c3486600 100644
--- a/src/Nazara/Utility/Mesh.cpp
+++ b/src/Nazara/Utility/Mesh.cpp
@@ -243,7 +243,7 @@ NzString NzMesh::GetAnimation() const
 	if (!m_impl)
 	{
 		NazaraError("Mesh not created");
-		return nzAnimationType_Static;
+		return NzString();
 	}
 	#endif