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

Remove Nz::String and Nz::StringStream

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-09-25 19:31:01 +02:00
parent d665af1f9d
commit 2b6a463a45
212 changed files with 1877 additions and 8721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Network/IpAddress.hpp
View File

@@ -8,11 +8,12 @@
#define NAZARA_IPADDRESS_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Network/Config.hpp>
#include <Nazara/Network/Enums.hpp>
#include <array>
#include <iosfwd>
#include <string>
#include <vector>
namespace Nz
{
@@ -30,12 +31,13 @@ namespace Nz
inline IpAddress(const UInt8& a, const UInt8& b, const UInt8& c, const UInt8& d, UInt16 port = 0);
inline IpAddress(const UInt16& a, const UInt16& b, const UInt16& c, const UInt16& d, const UInt16& e, const UInt16& f, const UInt16& g, const UInt16& h, UInt16 port = 0);
inline explicit IpAddress(const char* address);
inline explicit IpAddress(const String& address);
inline explicit IpAddress(const std::string& address);
IpAddress(const IpAddress&) = default;
IpAddress(IpAddress&&) noexcept = default;
~IpAddress() = default;
bool BuildFromAddress(const char* address);
inline bool BuildFromAddress(const std::string& address);
inline UInt16 GetPort() const;
inline NetProtocol GetProtocol() const;

15
include/Nazara/Network/IpAddress.inl
View File

@@ -78,7 +78,8 @@ namespace Nz
* \param address Hostname or textual IP address
*/
inline IpAddress::IpAddress(const char* address)
inline IpAddress::IpAddress(const char* address) :
IpAddress()
{
BuildFromAddress(address);
}
@@ -88,17 +89,21 @@ namespace Nz
*
* \param address Hostname or textual IP address
*/
inline IpAddress::IpAddress(const String& address)
inline IpAddress::IpAddress(const std::string& address) :
IpAddress()
{
BuildFromAddress(address.GetConstBuffer());
BuildFromAddress(address);
}
inline bool IpAddress::BuildFromAddress(const std::string& address)
{
return BuildFromAddress(address.c_str());
}
/*!
* \brief Gets the port
* \return Port attached to the IP address
*/
inline UInt16 IpAddress::GetPort() const
{
return m_port;

2
include/Nazara/Network/RUdpConnection.inl
View File

@@ -191,7 +191,7 @@ namespace Nz
return false;
}
NazaraError("PacketReliability not handled (0x" + String::Number(reliability, 16) + ')');
NazaraError("PacketReliability not handled (0x" + NumberToString(reliability, 16) + ')');
return false;
}