Fix a shitloads of warnings on VS
Former-commit-id: fca61118f4e0530ed2eaaf9ff96de29806aa5aa8
This commit is contained in:
@@ -23,11 +23,11 @@ namespace Nz
|
||||
AbstractHash(AbstractHash&&) = default;
|
||||
virtual ~AbstractHash();
|
||||
|
||||
virtual void Append(const UInt8* data, unsigned int len) = 0;
|
||||
virtual void Append(const UInt8* data, std::size_t len) = 0;
|
||||
virtual void Begin() = 0;
|
||||
virtual ByteArray End() = 0;
|
||||
|
||||
virtual unsigned int GetDigestLength() const = 0;
|
||||
virtual std::size_t GetDigestLength() const = 0;
|
||||
virtual const char* GetHashName() const = 0;
|
||||
|
||||
AbstractHash& operator=(const AbstractHash&) = delete;
|
||||
|
||||
@@ -204,10 +204,10 @@ namespace Nz
|
||||
|
||||
inline String ByteArray::ToHex() const
|
||||
{
|
||||
unsigned int length = m_array.size() * 2;
|
||||
std::size_t length = m_array.size() * 2;
|
||||
|
||||
String hexOutput(length, '\0');
|
||||
for (unsigned int i = 0; i < m_array.size(); ++i)
|
||||
for (std::size_t i = 0; i < m_array.size(); ++i)
|
||||
std::sprintf(&hexOutput[i * 2], "%02x", m_array[i]);
|
||||
|
||||
return hexOutput;
|
||||
|
||||
@@ -54,22 +54,24 @@ namespace Nz
|
||||
|
||||
inline Color Color::operator+(const Color& color) const
|
||||
{
|
||||
///TODO: Improve this shit
|
||||
Color c;
|
||||
c.r = std::min(static_cast<unsigned int>(r) + static_cast<unsigned int>(color.r), 255U);
|
||||
c.g = std::min(static_cast<unsigned int>(g) + static_cast<unsigned int>(color.g), 255U);
|
||||
c.b = std::min(static_cast<unsigned int>(b) + static_cast<unsigned int>(color.b), 255U);
|
||||
c.a = std::min(static_cast<unsigned int>(a) + static_cast<unsigned int>(color.a), 255U);
|
||||
c.r = static_cast<UInt8>(std::min(static_cast<unsigned int>(r) + static_cast<unsigned int>(color.r), 255U));
|
||||
c.g = static_cast<UInt8>(std::min(static_cast<unsigned int>(g) + static_cast<unsigned int>(color.g), 255U));
|
||||
c.b = static_cast<UInt8>(std::min(static_cast<unsigned int>(b) + static_cast<unsigned int>(color.b), 255U));
|
||||
c.a = static_cast<UInt8>(std::min(static_cast<unsigned int>(a) + static_cast<unsigned int>(color.a), 255U));
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
inline Color Color::operator*(const Color& color) const
|
||||
{
|
||||
///TODO: Improve this shit
|
||||
Color c;
|
||||
c.r = (static_cast<unsigned int>(r) * static_cast<unsigned int>(color.r)) / 255U;
|
||||
c.g = (static_cast<unsigned int>(g) * static_cast<unsigned int>(color.g)) / 255U;
|
||||
c.b = (static_cast<unsigned int>(b) * static_cast<unsigned int>(color.b)) / 255U;
|
||||
c.a = (static_cast<unsigned int>(a) * static_cast<unsigned int>(color.a)) / 255U;
|
||||
c.r = static_cast<UInt8>((static_cast<unsigned int>(r) * static_cast<unsigned int>(color.r)) / 255U);
|
||||
c.g = static_cast<UInt8>((static_cast<unsigned int>(g) * static_cast<unsigned int>(color.g)) / 255U);
|
||||
c.b = static_cast<UInt8>((static_cast<unsigned int>(b) * static_cast<unsigned int>(color.b)) / 255U);
|
||||
c.a = static_cast<UInt8>((static_cast<unsigned int>(a) * static_cast<unsigned int>(color.a)) / 255U);
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
#include <Nazara/Core/String.hpp>
|
||||
|
||||
#if NAZARA_CORE_ENABLE_ASSERTS || defined(NAZARA_DEBUG)
|
||||
#define NazaraAssert(a, err) do { if (!(a)) Nz::Error::Trigger(Nz::ErrorType_AssertFailed, err, __LINE__, Nz::Directory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION); } while (false)
|
||||
#define NazaraAssert(a, err) if (!(a)) Nz::Error::Trigger(Nz::ErrorType_AssertFailed, err, __LINE__, Nz::Directory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION)
|
||||
#else
|
||||
#define NazaraAssert(a, err) do {} while (false)
|
||||
#define NazaraAssert(a, err) for (;;) break
|
||||
#endif
|
||||
|
||||
#define NazaraError(err) Nz::Error::Trigger(Nz::ErrorType_Normal, err, __LINE__, Nz::Directory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION)
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace Nz
|
||||
HashCRC32(UInt32 polynomial = 0x04c11db7);
|
||||
virtual ~HashCRC32();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const override;
|
||||
std::size_t GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -22,11 +22,11 @@ namespace Nz
|
||||
HashFletcher16();
|
||||
virtual ~HashFletcher16();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const override;
|
||||
std::size_t GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace Nz
|
||||
HashMD5();
|
||||
virtual ~HashMD5();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const override;
|
||||
std::size_t GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace Nz
|
||||
HashSHA1();
|
||||
virtual ~HashSHA1();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const override;
|
||||
std::size_t GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace Nz
|
||||
HashSHA224();
|
||||
virtual ~HashSHA224();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const override;
|
||||
std::size_t GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace Nz
|
||||
HashSHA256();
|
||||
virtual ~HashSHA256();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const override;
|
||||
std::size_t GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace Nz
|
||||
HashSHA384();
|
||||
virtual ~HashSHA384();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const override;
|
||||
std::size_t GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace Nz
|
||||
HashSHA512();
|
||||
virtual ~HashSHA512();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const override;
|
||||
std::size_t GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -19,11 +19,11 @@ namespace Nz
|
||||
HashWhirlpool();
|
||||
virtual ~HashWhirlpool();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Append(const UInt8* data, std::size_t len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
unsigned int GetDigestLength() const;
|
||||
std::size_t GetDigestLength() const;
|
||||
const char* GetHashName() const;
|
||||
|
||||
private:
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
///TODO: Inline this
|
||||
class NAZARA_CORE_API PrimitiveList
|
||||
{
|
||||
public:
|
||||
@@ -35,9 +36,9 @@ namespace Nz
|
||||
void AddUVSphere(float size, unsigned int sliceCount = 4, unsigned int stackCount = 4, const Matrix4f& transformMatrix = Matrix4f::Identity());
|
||||
void AddUVSphere(float size, unsigned int sliceCount, unsigned int stackCount, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity());
|
||||
|
||||
Primitive& GetPrimitive(unsigned int i);
|
||||
const Primitive& GetPrimitive(unsigned int i) const;
|
||||
unsigned int GetSize() const;
|
||||
Primitive& GetPrimitive(std::size_t i);
|
||||
const Primitive& GetPrimitive(std::size_t i) const;
|
||||
std::size_t GetSize() const;
|
||||
|
||||
PrimitiveList& operator=(const PrimitiveList&) = default;
|
||||
PrimitiveList& operator=(PrimitiveList&&) = default;
|
||||
|
||||
@@ -32,12 +32,12 @@ namespace Nz
|
||||
|
||||
String();
|
||||
explicit String(char character);
|
||||
String(unsigned int rep, char character);
|
||||
String(unsigned int rep, const char* string);
|
||||
String(unsigned int rep, const char* string, unsigned int length);
|
||||
String(unsigned int rep, const String& string);
|
||||
String(std::size_t rep, char character);
|
||||
String(std::size_t rep, const char* string);
|
||||
String(std::size_t rep, const char* string, std::size_t length);
|
||||
String(std::size_t rep, const String& string);
|
||||
String(const char* string);
|
||||
String(const char* string, unsigned int length);
|
||||
String(const char* string, std::size_t length);
|
||||
String(const std::string& string);
|
||||
String(const String& string) = default;
|
||||
String(String&& string) noexcept = default;
|
||||
@@ -45,57 +45,57 @@ namespace Nz
|
||||
|
||||
String& Append(char character);
|
||||
String& Append(const char* string);
|
||||
String& Append(const char* string, unsigned int length);
|
||||
String& Append(const char* string, std::size_t length);
|
||||
String& Append(const String& string);
|
||||
|
||||
void Clear(bool keepBuffer = false);
|
||||
|
||||
bool Contains(char character, int start = 0, UInt32 flags = None) const;
|
||||
bool Contains(const char* string, int start = 0, UInt32 flags = None) const;
|
||||
bool Contains(const String& string, int start = 0, UInt32 flags = None) const;
|
||||
bool Contains(char character, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
bool Contains(const char* string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
bool Contains(const String& string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
|
||||
unsigned int Count(char character, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Count(const char* string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Count(const String& string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int CountAny(const char* string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int CountAny(const String& string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Count(char character, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int Count(const char* string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int Count(const String& string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int CountAny(const char* string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int CountAny(const String& string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
|
||||
bool EndsWith(char character, UInt32 flags = None) const;
|
||||
bool EndsWith(const char* string, UInt32 flags = None) const;
|
||||
bool EndsWith(const char* string, unsigned int length, UInt32 flags = None) const;
|
||||
bool EndsWith(const char* string, std::size_t length, UInt32 flags = None) const;
|
||||
bool EndsWith(const String& string, UInt32 flags = None) const;
|
||||
|
||||
unsigned int Find(char character, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Find(const char* string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Find(const String& string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int FindAny(const char* string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int FindAny(const String& string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int FindLast(char character, int start = -1, UInt32 flags = None) const;
|
||||
unsigned int FindLast(const char *string, int start = -1, UInt32 flags = None) const;
|
||||
unsigned int FindLast(const String& string, int start = -1, UInt32 flags = None) const;
|
||||
unsigned int FindLastAny(const char* string, int start = -1, UInt32 flags = None) const;
|
||||
unsigned int FindLastAny(const String& string, int start = -1, UInt32 flags = None) const;
|
||||
unsigned int FindLastWord(const char* string, int start = -1, UInt32 flags = None) const;
|
||||
unsigned int FindLastWord(const String& string, int start = -1, UInt32 flags = None) const;
|
||||
unsigned int FindWord(const char* string, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int FindWord(const String& string, int start = 0, UInt32 flags = None) const;
|
||||
std::size_t Find(char character, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
std::size_t Find(const char* string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
std::size_t Find(const String& string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
std::size_t FindAny(const char* string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
std::size_t FindAny(const String& string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
std::size_t FindLast(char character, std::intmax_t start = -1, UInt32 flags = None) const;
|
||||
std::size_t FindLast(const char *string, std::intmax_t start = -1, UInt32 flags = None) const;
|
||||
std::size_t FindLast(const String& string, std::intmax_t start = -1, UInt32 flags = None) const;
|
||||
std::size_t FindLastAny(const char* string, std::intmax_t start = -1, UInt32 flags = None) const;
|
||||
std::size_t FindLastAny(const String& string, std::intmax_t start = -1, UInt32 flags = None) const;
|
||||
std::size_t FindLastWord(const char* string, std::intmax_t start = -1, UInt32 flags = None) const;
|
||||
std::size_t FindLastWord(const String& string, std::intmax_t start = -1, UInt32 flags = None) const;
|
||||
std::size_t FindWord(const char* string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
std::size_t FindWord(const String& string, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
|
||||
char* GetBuffer();
|
||||
unsigned int GetCapacity() const;
|
||||
std::size_t GetCapacity() const;
|
||||
const char* GetConstBuffer() const;
|
||||
unsigned int GetLength() const;
|
||||
unsigned int GetSize() const;
|
||||
std::size_t GetLength() const;
|
||||
std::size_t GetSize() const;
|
||||
std::string GetUtf8String() const;
|
||||
std::u16string GetUtf16String() const;
|
||||
std::u32string GetUtf32String() const;
|
||||
std::wstring GetWideString() const;
|
||||
String GetWord(unsigned int index, UInt32 flags = None) const;
|
||||
unsigned int GetWordPosition(unsigned int index, UInt32 flags = None) const;
|
||||
std::size_t GetWordPosition(unsigned int index, UInt32 flags = None) const;
|
||||
|
||||
String& Insert(int pos, char character);
|
||||
String& Insert(int pos, const char* string);
|
||||
String& Insert(int pos, const char* string, unsigned int length);
|
||||
String& Insert(int pos, const String& string);
|
||||
String& Insert(std::intmax_t pos, char character);
|
||||
String& Insert(std::intmax_t pos, const char* string);
|
||||
String& Insert(std::intmax_t pos, const char* string, std::size_t length);
|
||||
String& Insert(std::intmax_t pos, const String& string);
|
||||
|
||||
bool IsEmpty() const;
|
||||
bool IsNull() const;
|
||||
@@ -106,32 +106,32 @@ namespace Nz
|
||||
|
||||
String& Prepend(char character);
|
||||
String& Prepend(const char* string);
|
||||
String& Prepend(const char* string, unsigned int length);
|
||||
String& Prepend(const char* string, std::size_t length);
|
||||
String& Prepend(const String& string);
|
||||
|
||||
unsigned int Replace(char oldCharacter, char newCharacter, int start = 0, UInt32 flags = None);
|
||||
unsigned int Replace(const char* oldString, const char* replaceString, int start = 0, UInt32 flags = None);
|
||||
unsigned int Replace(const char* oldString, unsigned int oldLength, const char* replaceString, unsigned int replaceLength, int start = 0, UInt32 flags = None);
|
||||
unsigned int Replace(const String& oldString, const String& replaceString, int start = 0, UInt32 flags = None);
|
||||
unsigned int ReplaceAny(const char* oldCharacters, char replaceCharacter, int start = 0, UInt32 flags = None);
|
||||
//unsigned int ReplaceAny(const char* oldCharacters, const char* replaceString, int start = 0, UInt32 flags = None);
|
||||
//unsigned int ReplaceAny(const String& oldCharacters, const String& replaceString, int start = 0, UInt32 flags = None);
|
||||
unsigned int Replace(char oldCharacter, char newCharacter, std::intmax_t start = 0, UInt32 flags = None);
|
||||
unsigned int Replace(const char* oldString, const char* replaceString, std::intmax_t start = 0, UInt32 flags = None);
|
||||
unsigned int Replace(const char* oldString, std::size_t oldLength, const char* replaceString, std::size_t replaceLength, std::intmax_t start = 0, UInt32 flags = None);
|
||||
unsigned int Replace(const String& oldString, const String& replaceString, std::intmax_t start = 0, UInt32 flags = None);
|
||||
unsigned int ReplaceAny(const char* oldCharacters, char replaceCharacter, std::intmax_t start = 0, UInt32 flags = None);
|
||||
//unsigned int ReplaceAny(const char* oldCharacters, const char* replaceString, std::intmax_t start = 0, UInt32 flags = None);
|
||||
//unsigned int ReplaceAny(const String& oldCharacters, const String& replaceString, std::intmax_t start = 0, UInt32 flags = None);
|
||||
|
||||
void Reserve(unsigned int bufferSize);
|
||||
void Reserve(std::size_t bufferSize);
|
||||
|
||||
String& Resize(int size, char character = ' ');
|
||||
String Resized(int size, char character = ' ') const;
|
||||
String& Resize(std::intmax_t size, char character = ' ');
|
||||
String Resized(std::intmax_t size, char character = ' ') const;
|
||||
|
||||
String& Reverse();
|
||||
String Reversed() const;
|
||||
|
||||
String& Set(char character);
|
||||
String& Set(unsigned int rep, char character);
|
||||
String& Set(unsigned int rep, const char* string);
|
||||
String& Set(unsigned int rep, const char* string, unsigned int length);
|
||||
String& Set(unsigned int rep, const String& string);
|
||||
String& Set(std::size_t rep, char character);
|
||||
String& Set(std::size_t rep, const char* string);
|
||||
String& Set(std::size_t rep, const char* string, std::size_t length);
|
||||
String& Set(std::size_t rep, const String& string);
|
||||
String& Set(const char* string);
|
||||
String& Set(const char* string, unsigned int length);
|
||||
String& Set(const char* string, std::size_t length);
|
||||
String& Set(const std::string& string);
|
||||
String& Set(const String& string);
|
||||
String& Set(String&& string) noexcept;
|
||||
@@ -139,26 +139,26 @@ namespace Nz
|
||||
String Simplified(UInt32 flags = None) const;
|
||||
String& Simplify(UInt32 flags = None);
|
||||
|
||||
unsigned int Split(std::vector<String>& result, char separation = ' ', int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Split(std::vector<String>& result, const char* separation, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Split(std::vector<String>& result, const char* separation, unsigned int length, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Split(std::vector<String>& result, const String& separation, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int SplitAny(std::vector<String>& result, const char* separations, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int SplitAny(std::vector<String>& result, const String& separations, int start = 0, UInt32 flags = None) const;
|
||||
unsigned int Split(std::vector<String>& result, char separation = ' ', std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int Split(std::vector<String>& result, const char* separation, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int Split(std::vector<String>& result, const char* separation, std::size_t length, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int Split(std::vector<String>& result, const String& separation, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int SplitAny(std::vector<String>& result, const char* separations, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
unsigned int SplitAny(std::vector<String>& result, const String& separations, std::intmax_t start = 0, UInt32 flags = None) const;
|
||||
|
||||
bool StartsWith(char character, UInt32 flags = None) const;
|
||||
bool StartsWith(const char* string, UInt32 flags = None) const;
|
||||
bool StartsWith(const String& string, UInt32 flags = None) const;
|
||||
|
||||
String SubString(int startPos, int endPos = -1) const;
|
||||
String SubStringFrom(char character, int startPos = 0, bool fromLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringFrom(const char *string, int startPos = 0, bool fromLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringFrom(const char *string, unsigned int length, int startPos = 0, bool fromLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringFrom(const String& string, int startPos = 0, bool fromLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringTo(char character, int startPos = 0, bool toLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringTo(const char *string, int startPos = 0, bool toLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringTo(const char *string, unsigned int length, int startPos = 0, bool toLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringTo(const String& string, int startPos = 0, bool toLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubString(std::intmax_t startPos, std::intmax_t endPos = -1) const;
|
||||
String SubStringFrom(char character, std::intmax_t startPos = 0, bool fromLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringFrom(const char* string, std::intmax_t startPos = 0, bool fromLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringFrom(const char* string, std::size_t length, std::intmax_t startPos = 0, bool fromLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringFrom(const String& string, std::intmax_t startPos = 0, bool fromLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringTo(char character, std::intmax_t startPos = 0, bool toLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringTo(const char* string, std::intmax_t startPos = 0, bool toLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringTo(const char* string, std::size_t length, std::intmax_t startPos = 0, bool toLast = false, bool include = false, UInt32 flags = None) const;
|
||||
String SubStringTo(const String& string, std::intmax_t startPos = 0, bool toLast = false, bool include = false, UInt32 flags = None) const;
|
||||
|
||||
void Swap(String& str);
|
||||
|
||||
@@ -193,8 +193,8 @@ namespace Nz
|
||||
|
||||
operator std::string() const;
|
||||
|
||||
char& operator[](unsigned int pos);
|
||||
char operator[](unsigned int pos) const;
|
||||
char& operator[](std::size_t pos);
|
||||
char operator[](std::size_t pos) const;
|
||||
|
||||
String& operator=(char character);
|
||||
String& operator=(const char* string);
|
||||
@@ -296,7 +296,7 @@ namespace Nz
|
||||
NAZARA_CORE_API friend bool operator>=(const char* string, const String& nstring);
|
||||
NAZARA_CORE_API friend bool operator>=(const std::string& string, const String& nstring);
|
||||
|
||||
static const unsigned int npos;
|
||||
static const std::size_t npos;
|
||||
|
||||
private:
|
||||
struct SharedString;
|
||||
@@ -313,11 +313,11 @@ namespace Nz
|
||||
struct SharedString
|
||||
{
|
||||
inline SharedString();
|
||||
inline SharedString(unsigned int strSize);
|
||||
inline SharedString(unsigned int strSize, unsigned int strCapacity);
|
||||
inline SharedString(std::size_t strSize);
|
||||
inline SharedString(std::size_t strSize, std::size_t strCapacity);
|
||||
|
||||
unsigned int capacity;
|
||||
unsigned int size;
|
||||
std::size_t capacity;
|
||||
std::size_t size;
|
||||
std::unique_ptr<char[]> string;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace Nz
|
||||
{
|
||||
}
|
||||
|
||||
inline String::SharedString::SharedString(unsigned int strSize) :
|
||||
inline String::SharedString::SharedString(std::size_t strSize) :
|
||||
capacity(strSize),
|
||||
size(strSize),
|
||||
string(new char[strSize + 1])
|
||||
@@ -31,7 +31,7 @@ namespace Nz
|
||||
string[strSize] = '\0';
|
||||
}
|
||||
|
||||
inline String::SharedString::SharedString(unsigned int strSize, unsigned int strCapacity) :
|
||||
inline String::SharedString::SharedString(std::size_t strSize, std::size_t strCapacity) :
|
||||
capacity(strCapacity),
|
||||
size(strSize),
|
||||
string(new char[strCapacity + 1])
|
||||
|
||||
@@ -50,7 +50,7 @@ namespace Nz
|
||||
|
||||
private:
|
||||
std::vector<String> m_strings;
|
||||
unsigned int m_bufferSize;
|
||||
std::size_t m_bufferSize;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user