- clang format + naming improved

This commit is contained in:
2026-09-03 10:03:42 +03:00
parent 249e614def
commit e166bae1ea
204 changed files with 20621 additions and 21019 deletions
+78 -71
View File
@@ -8,7 +8,7 @@
#include <assert.h>
#if defined(TARGET_ANDROID)
# define __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
@@ -25,35 +25,21 @@ Variant::Variant()
mPointer = nullptr;
}
Variant::~Variant()
{
}
Variant::~Variant() {}
Variant::Variant(bool value)
:mType(VTYPE_BOOL), mBool(value)
{}
Variant::Variant(bool value) : mType(VTYPE_BOOL), mBool(value) {}
Variant::Variant(int value)
:mType(VTYPE_INT), mInt(value)
{}
Variant::Variant(int value) : mType(VTYPE_INT), mInt(value) {}
Variant::Variant(int64_t value)
:mType(VTYPE_INT64), mInt64(value)
{}
Variant::Variant(int64_t value) : mType(VTYPE_INT64), mInt64(value) {}
Variant::Variant(float value)
:mType(VTYPE_FLOAT), mFloat(value)
{}
Variant::Variant(float value) : mType(VTYPE_FLOAT), mFloat(value) {}
Variant::Variant(double value)
:mType(VTYPE_FLOAT), mFloat((float)value)
{}
Variant::Variant(double value) : mType(VTYPE_FLOAT), mFloat((float)value) {}
Variant::Variant(const std::string& value)
:mType(VTYPE_STRING), mString(value)
{}
Variant::Variant(const std::string& value) : mType(VTYPE_STRING), mString(value) {}
Variant& Variant::operator = (bool value)
Variant& Variant::operator=(bool value)
{
mType = VTYPE_BOOL;
mBool = value;
@@ -61,7 +47,7 @@ Variant& Variant::operator = (bool value)
return *this;
}
Variant& Variant::operator = (int value)
Variant& Variant::operator=(int value)
{
mType = VTYPE_INT;
mInt = value;
@@ -69,7 +55,7 @@ Variant& Variant::operator = (int value)
return *this;
}
Variant& Variant::operator = (int64_t value)
Variant& Variant::operator=(int64_t value)
{
mType = VTYPE_INT64;
mInt64 = value;
@@ -77,7 +63,7 @@ Variant& Variant::operator = (int64_t value)
return *this;
}
Variant& Variant::operator = (float value)
Variant& Variant::operator=(float value)
{
mType = VTYPE_FLOAT;
mFloat = value;
@@ -85,7 +71,7 @@ Variant& Variant::operator = (float value)
return *this;
}
Variant& Variant::operator = (const std::string& value)
Variant& Variant::operator=(const std::string& value)
{
mType = VTYPE_STRING;
mString = value;
@@ -93,7 +79,7 @@ Variant& Variant::operator = (const std::string& value)
return *this;
}
Variant& Variant::operator = (const char* value)
Variant& Variant::operator=(const char* value)
{
mType = VTYPE_STRING;
mString = value;
@@ -101,7 +87,7 @@ Variant& Variant::operator = (const char* value)
return *this;
}
Variant& Variant::operator = (void* value)
Variant& Variant::operator=(void* value)
{
mType = VTYPE_POINTER;
mPointer = value;
@@ -109,7 +95,7 @@ Variant& Variant::operator = (void* value)
return *this;
}
Variant& Variant::operator = (PVariantMap map)
Variant& Variant::operator=(PVariantMap map)
{
mType = VTYPE_VMAP;
mVMap = map;
@@ -117,94 +103,119 @@ Variant& Variant::operator = (PVariantMap map)
return *this;
}
Variant Variant::operator + (const Variant& rhs)
Variant Variant::operator+(const Variant& rhs)
{
switch (type())
{
case VTYPE_BOOL:
case VTYPE_INT: return asInt() + rhs.asInt();
case VTYPE_INT64: return asInt64() + rhs.asInt64();
case VTYPE_FLOAT: return asFloat() + rhs.asFloat();
case VTYPE_STRING: return asStdString() + rhs.asStdString();
case VTYPE_INT:
return asInt() + rhs.asInt();
case VTYPE_INT64:
return asInt64() + rhs.asInt64();
case VTYPE_FLOAT:
return asFloat() + rhs.asFloat();
case VTYPE_STRING:
return asStdString() + rhs.asStdString();
default:
return false;
}
}
Variant Variant::operator - (const Variant& rhs)
Variant Variant::operator-(const Variant& rhs)
{
switch (type())
{
case VTYPE_BOOL:
case VTYPE_STRING:
case VTYPE_INT: return asInt() - rhs.asInt();
case VTYPE_INT64: return asInt64() - rhs.asInt64();
case VTYPE_FLOAT: return asFloat() - rhs.asFloat();
case VTYPE_INT:
return asInt() - rhs.asInt();
case VTYPE_INT64:
return asInt64() - rhs.asInt64();
case VTYPE_FLOAT:
return asFloat() - rhs.asFloat();
default:
return false;
}
}
Variant Variant::operator * (const Variant& rhs)
Variant Variant::operator*(const Variant& rhs)
{
switch (type())
{
case VTYPE_BOOL:
case VTYPE_STRING:
case VTYPE_INT: return asInt() * rhs.asInt();
case VTYPE_INT64: return asInt64() * rhs.asInt64();
case VTYPE_FLOAT: return asFloat() * rhs.asFloat();
case VTYPE_INT:
return asInt() * rhs.asInt();
case VTYPE_INT64:
return asInt64() * rhs.asInt64();
case VTYPE_FLOAT:
return asFloat() * rhs.asFloat();
default:
return false;
}
}
Variant Variant::operator / (const Variant& rhs)
Variant Variant::operator/(const Variant& rhs)
{
switch (type())
{
case VTYPE_BOOL:
case VTYPE_STRING:
case VTYPE_INT: return asInt() / rhs.asInt();
case VTYPE_INT64: return asInt64() / rhs.asInt64();
case VTYPE_FLOAT: return asFloat() / rhs.asFloat();
case VTYPE_INT:
return asInt() / rhs.asInt();
case VTYPE_INT64:
return asInt64() / rhs.asInt64();
case VTYPE_FLOAT:
return asFloat() / rhs.asFloat();
default:
return false;
}
}
bool Variant::operator < (const Variant& rhs) const
bool Variant::operator<(const Variant& rhs) const
{
switch (type())
{
case VTYPE_STRING: return asStdString() < rhs.asStdString();
case VTYPE_STRING:
return asStdString() < rhs.asStdString();
case VTYPE_BOOL:
case VTYPE_INT: return asInt() < rhs.asInt();
case VTYPE_INT64: return asInt64() < rhs.asInt64();
case VTYPE_FLOAT: return asFloat() < rhs.asFloat();
case VTYPE_INT:
return asInt() < rhs.asInt();
case VTYPE_INT64:
return asInt64() < rhs.asInt64();
case VTYPE_FLOAT:
return asFloat() < rhs.asFloat();
default:
return false;
}
}
bool Variant::operator > (const Variant& rhs) const
bool Variant::operator>(const Variant& rhs) const
{
return !(*this == rhs) && !(*this < rhs);
}
bool Variant::operator == (const Variant& rhs) const
bool Variant::operator==(const Variant& rhs) const
{
switch (type())
{
case VTYPE_STRING: return asStdString() == rhs.asStdString();
case VTYPE_BOOL: return asBool() == rhs.asBool();
case VTYPE_INT: return asInt() == rhs.asInt();
case VTYPE_INT64: return asInt64() == rhs.asInt64();
case VTYPE_FLOAT: return asFloat() == rhs.asFloat();
case VTYPE_POINTER: return asPointer() == rhs.asPointer();
case VTYPE_VMAP: assert(0); break;
case VTYPE_STRING:
return asStdString() == rhs.asStdString();
case VTYPE_BOOL:
return asBool() == rhs.asBool();
case VTYPE_INT:
return asInt() == rhs.asInt();
case VTYPE_INT64:
return asInt64() == rhs.asInt64();
case VTYPE_FLOAT:
return asFloat() == rhs.asFloat();
case VTYPE_POINTER:
return asPointer() == rhs.asPointer();
case VTYPE_VMAP:
assert(0);
break;
default:
return false;
}
@@ -212,17 +223,17 @@ bool Variant::operator == (const Variant& rhs) const
return false;
}
bool Variant::operator != (const Variant& rhs) const
bool Variant::operator!=(const Variant& rhs) const
{
return !(*this == rhs);
}
bool Variant::operator <= (const Variant& rhs) const
bool Variant::operator<=(const Variant& rhs) const
{
return (*this < rhs) || (*this == rhs);
}
bool Variant::operator >= (const Variant& rhs) const
bool Variant::operator>=(const Variant& rhs) const
{
return (*this > rhs) || (*this == rhs);
}
@@ -345,13 +356,9 @@ VariantType Variant::type() const
return mType;
}
VariantMap::VariantMap()
{
}
VariantMap::VariantMap() {}
VariantMap::~VariantMap()
{
}
VariantMap::~VariantMap() {}
bool VariantMap::empty() const
{
@@ -368,7 +375,7 @@ bool VariantMap::exists(int itemId) const
return mData.find(itemId) != mData.end();
}
Variant& VariantMap::operator [](int itemId)
Variant& VariantMap::operator[](int itemId)
{
return mData[itemId];
}