BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Moose

Browse Source
This commit is contained in:
Scott E. Graves
2017-05-10 12:08:53 -05:00
parent 6c1776945f
commit 6111df3bd6
6 changed files with 121 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/siadrive_api/siaapi.h
View File

@@ -130,6 +130,9 @@ public:
Property(SiaCurrency, UnconfirmedBalance, public, private)
Property(SString, ReceiveAddress, public, private)
private:
CSiaTransactionListPtr _transList;
private:
virtual void Refresh(const CSiaCurl& siaCurl, CSiaDriveConfig* siaDriveConfig);

56
include/siadrive_api/sstring.h
View File

@@ -63,7 +63,7 @@ public:
#ifdef _UNICODE
static std::wstring ActiveString(const std::string& str)
{
return std::move(FromUtf8(str));
return FromUtf8(str);
}
static inline std::wstring ActiveString(const std::wstring& str)
@@ -73,7 +73,7 @@ public:
#else
static inline std::string ActiveString(const std::wstring& str)
{
return std::move(ToUtf8(str));
return ToUtf8(str);
}
static inline std::string ActiveString(const std::string& str)
@@ -126,7 +126,7 @@ public:
static inline SString FromInt32(const std::int32_t &value)
{
return std::move(SString(std::to_string(value)));
return SString(std::to_string(value));
}
static inline std::uint32_t ToUInt32(const SString &str)
@@ -136,7 +136,7 @@ public:
static inline SString FromUInt32(const std::uint32_t &value)
{
return std::move(SString(std::to_string(value)));
return SString(std::to_string(value));
}
static inline std::int64_t ToInt64(const SString &str)
@@ -146,12 +146,12 @@ public:
static inline SString FromInt64(const std::int64_t &value)
{
return std::move(SString(std::to_string(value)));
return SString(std::to_string(value));
}
static inline SString FromUInt64(const std::uint64_t &value)
{
return std::move(SString(std::to_string(value)));
return SString(std::to_string(value));
}
static inline std::uint64_t ToUInt64(const SString &str)
@@ -166,7 +166,7 @@ public:
static inline SString FromUInt8(const std::uint8_t &value)
{
return std::move(SString(std::to_string(value)));
return SString(std::to_string(value));
}
static inline float ToFloat(const SString &str)
@@ -176,7 +176,7 @@ public:
static inline SString FromFloat(const float &value)
{
return std::move(SString(std::to_string(value)));
return SString(std::to_string(value));
}
static inline long ToLong(const SString &str)
@@ -186,7 +186,7 @@ public:
static inline SString FromLong(const long &value)
{
return std::move(SString(std::to_string(value)));
return SString(std::to_string(value));
}
static inline double ToDouble(const SString &str)
@@ -196,7 +196,7 @@ public:
static inline SString FromDouble(const double &value)
{
return std::move(SString(std::to_string(value)));
return SString(std::to_string(value));
}
static bool ToBool(const SString& value)
@@ -221,7 +221,7 @@ public:
{
ret.push_back(&s[0]);
}
return std::move(ret);
return ret;
}
#ifdef _UNICODE
@@ -232,7 +232,7 @@ public:
{
ret.push_back(ToUtf8(s.str()));
}
return std::move(ret);
return ret;
}
#else
static std::vector<std::string> ToUtf8Array(const SStringVector& v)
@@ -242,7 +242,7 @@ public:
{
ret.push_back(s.str());
}
return std::move(ret);
return ret;
}
#endif
@@ -253,7 +253,7 @@ public:
SString(const std::string &str) :
#ifdef _UNICODE
_str(std::move(SString::FromUtf8(str)))
_str(SString::FromUtf8(str))
#else
_str(str)
#endif
@@ -262,7 +262,7 @@ public:
SString(const char *str) :
#ifdef _UNICODE
_str(std::move(SString::FromUtf8(str)))
_str(SString::FromUtf8(str))
#else
_str(str)
#endif
@@ -273,7 +273,7 @@ public:
#ifdef _UNICODE
_str(str)
#else
_str(std::move(SString::ToUtf8(str)))
_str(SString::ToUtf8(str))
#endif
{
}
@@ -282,7 +282,7 @@ public:
#ifdef _UNICODE
_str(str)
#else
_str(std::move(SString::ToUtf8(str)))
_str(SString::ToUtf8(str))
#endif
{
}
@@ -375,7 +375,7 @@ public:
{
String str = _str;
std::transform(str.begin(), str.end(), str.begin(), ::tolower);
return std::move(str);
return str;
}
SString &ToUpper()
@@ -388,7 +388,7 @@ public:
{
String str = _str;
std::transform(str.begin(), str.end(), str.begin(), ::toupper);
return std::move(str);
return str;
}
bool IsEmpty() const
@@ -463,7 +463,7 @@ public:
SString ReplaceCopy(const char &character, const char &with) const
{
SString copy = _str;
return std::move(copy.Replace((SChar) character, (SChar) with));
return copy.Replace((SChar) character, (SChar) with);
}
#endif
@@ -471,7 +471,7 @@ public:
SString ReplaceCopy(const SChar &character, const SChar &with) const
{
SString copy = _str;
return std::move(copy.Replace(character, with));
return copy.Replace(character, with);
}
SString& Replace(const SString& str, const SString& with, size_t startPos = 0)
@@ -490,7 +490,7 @@ public:
SString ReplaceCopy(const SString& str, const SString& with, size_t startPos = 0) const
{
return std::move(SString(_str).Replace(str, with, startPos));
return SString(_str).Replace(str, with, startPos);
}
inline void Resize(const String::size_type& size)
@@ -516,7 +516,7 @@ public:
elems.push_back(trim ? Trim(item) : item);
}
return std::move(elems);
return elems;
}
SString& TrimLeft()
@@ -528,7 +528,7 @@ public:
SString TrimLeftCopy() const
{
String copy(_str);
return std::move(LeftTrim(copy));
return LeftTrim(copy);
}
SString& TrimRight()
@@ -540,7 +540,7 @@ public:
SString TrimRightCopy() const
{
String copy(_str);
return std::move(RightTrim(copy));
return RightTrim(copy);
}
SString& Trim()
@@ -552,7 +552,7 @@ public:
SString TrimCopy() const
{
String copy(_str);
return std::move(Trim(copy));
return Trim(copy);
}
SString SubString(const size_t &start, const size_t &count) const
@@ -670,7 +670,7 @@ public:
operator std::string() const
{
#ifdef _UNICODE
return std::move(SString::ToUtf8(_str));
return SString::ToUtf8(_str);
#else
return _str;
#endif
@@ -681,7 +681,7 @@ public:
#ifdef _UNICODE
return _str;
#else
return std::move(SString::FromUtf8(_str));
return SString::FromUtf8(_str);
#endif
}