sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made String(char) explicit 

Former-commit-id: 02f5ead8fe60b825464f956d9fc6ea4689bda44b
This commit is contained in:
Lynix 2013-05-11 13:51:56 +02:00
parent 459c7a4d07
commit 991d841d57
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/String.hpp
View File

@ -32,7 +32,7 @@ class NAZARA_API NzString : public NzHashable
struct SharedString; struct SharedString;
NzString(); NzString();
NzString(char character); explicit NzString(char character);
NzString(const char* string); NzString(const char* string);
NzString(const std::string& string); NzString(const std::string& string);
NzString(const NzString& string); NzString(const NzString& string);

2
include/Nazara/Math/Basic.inl
View File

@ -189,7 +189,7 @@ NzString NzNumberToString(long long number, nzUInt8 radix)
#endif #endif
if (number == 0) if (number == 0)
return '0'; return NzString('0');
static const char* symbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; static const char* symbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";

2
src/Nazara/Core/PluginManager.cpp
View File

@ -44,7 +44,7 @@ bool NzPluginManager::AddDirectory(const NzString& directoryPath)
bool NzPluginManager::Initialize() bool NzPluginManager::Initialize()
{ {
s_directories.push_back(NzFile::AbsolutePath('.')); s_directories.push_back(NzFile::AbsolutePath("."));
NzString libDir = NzFile::AbsolutePath("lib"); NzString libDir = NzFile::AbsolutePath("lib");
if (NzDirectory::Exists(libDir)) if (NzDirectory::Exists(libDir))

6
src/Nazara/Core/String.cpp
View File

@ -3778,7 +3778,7 @@ NzString NzString::SubstrTo(char character, int startPos, bool toLast, bool incl
pos = Find(character, startPos, flags); pos = Find(character, startPos, flags);
if (pos == 0) if (pos == 0)
return (include) ? character : NzString(); return (include) ? NzString(character) : NzString();
else if (pos == npos) else if (pos == npos)
return *this; return *this;
@ -4903,7 +4903,7 @@ NzString operator+(char character, const NzString& string)
return string; return string;
if (string.IsEmpty()) if (string.IsEmpty())
return character; return NzString(character);
unsigned int totalSize = string.m_sharedString->size+1; unsigned int totalSize = string.m_sharedString->size+1;
char* str = new char[totalSize+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) bool operator<=(char character, const NzString& nstring)
{ {
return !operator<(nstring, character); return !operator<(nstring, NzString(character));
} }
bool operator<=(const char* string, const NzString& nstring) bool operator<=(const char* string, const NzString& nstring)

4
src/Nazara/Core/StringStream.cpp
View File

@ -153,7 +153,7 @@ NzStringStream& NzStringStream::operator<<(char character)
{ {
NazaraLock(m_mutex) NazaraLock(m_mutex)
m_strings.push_back(character); m_strings.push_back(NzString(character));
m_bufferSize++; m_bufferSize++;
return *this; return *this;
@ -163,7 +163,7 @@ NzStringStream& NzStringStream::operator<<(unsigned char character)
{ {
NazaraLock(m_mutex) NazaraLock(m_mutex)
m_strings.push_back(character); m_strings.push_back(NzString(character));
m_bufferSize++; m_bufferSize++;
return *this; return *this;

2
src/Nazara/Utility/Mesh.cpp
View File

@ -243,7 +243,7 @@ NzString NzMesh::GetAnimation() const
if (!m_impl) if (!m_impl)
{ {
NazaraError("Mesh not created"); NazaraError("Mesh not created");
return nzAnimationType_Static; return NzString();
} }
#endif #endif