Made String(char) explicit
Former-commit-id: 02f5ead8fe60b825464f956d9fc6ea4689bda44b
This commit is contained in:
parent
459c7a4d07
commit
991d841d57
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ NzString NzMesh::GetAnimation() const
|
|||
if (!m_impl)
|
||||
{
|
||||
NazaraError("Mesh not created");
|
||||
return nzAnimationType_Static;
|
||||
return NzString();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue