diff options
author | Bastiaan Olij <mux213@gmail.com> | 2018-11-24 09:09:41 +1100 |
---|---|---|
committer | Bastiaan Olij <mux213@gmail.com> | 2018-11-24 09:09:41 +1100 |
commit | fc20fa3fce2f30c96fa2bbf8d460817f91b90e81 (patch) | |
tree | decd51288822651ad34fd270e68a2f2a54d0bd8d /src/core/Variant.cpp | |
parent | 0a6f5d052a0d05e07ca1b7eab8e53bbd8450a991 (diff) | |
download | redot-cpp-fc20fa3fce2f30c96fa2bbf8d460817f91b90e81.tar.gz |
Implementing clang-format and applying it to all classes
Diffstat (limited to 'src/core/Variant.cpp')
-rw-r--r-- | src/core/Variant.cpp | 349 |
1 files changed, 131 insertions, 218 deletions
diff --git a/src/core/Variant.cpp b/src/core/Variant.cpp index 4f88951..a013639 100644 --- a/src/core/Variant.cpp +++ b/src/core/Variant.cpp @@ -2,8 +2,8 @@ #include <gdnative/variant.h> -#include "Defs.hpp" #include "CoreTypes.hpp" +#include "Defs.hpp" #include "GodotGlobal.hpp" #include "Object.hpp" @@ -11,18 +11,15 @@ namespace godot { -Variant::Variant() -{ +Variant::Variant() { godot::api->godot_variant_new_nil(&_godot_variant); } -Variant::Variant(const Variant& v) -{ +Variant::Variant(const Variant &v) { godot::api->godot_variant_new_copy(&_godot_variant, &v._godot_variant); } -Variant::Variant(bool p_bool) -{ +Variant::Variant(bool p_bool) { godot::api->godot_variant_new_bool(&_godot_variant, p_bool); } @@ -31,410 +28,326 @@ Variant::Variant(signed int p_int) // real one godot::api->godot_variant_new_int(&_godot_variant, p_int); } -Variant::Variant(unsigned int p_int) -{ +Variant::Variant(unsigned int p_int) { godot::api->godot_variant_new_uint(&_godot_variant, p_int); } Variant::Variant(signed short p_short) // real one { - godot::api->godot_variant_new_int(&_godot_variant, (int) p_short); + godot::api->godot_variant_new_int(&_godot_variant, (int)p_short); } - Variant::Variant(int64_t p_char) // real one { godot::api->godot_variant_new_int(&_godot_variant, p_char); } -Variant::Variant(uint64_t p_char) -{ +Variant::Variant(uint64_t p_char) { godot::api->godot_variant_new_uint(&_godot_variant, p_char); } -Variant::Variant(float p_float) -{ +Variant::Variant(float p_float) { godot::api->godot_variant_new_real(&_godot_variant, p_float); } -Variant::Variant(double p_double) -{ +Variant::Variant(double p_double) { godot::api->godot_variant_new_real(&_godot_variant, p_double); } -Variant::Variant(const String& p_string) -{ - godot::api->godot_variant_new_string(&_godot_variant, (godot_string *) &p_string); +Variant::Variant(const String &p_string) { + godot::api->godot_variant_new_string(&_godot_variant, (godot_string *)&p_string); } -Variant::Variant(const char * const p_cstring) -{ +Variant::Variant(const char *const p_cstring) { String s = String(p_cstring); - godot::api->godot_variant_new_string(&_godot_variant, (godot_string *) &s); + godot::api->godot_variant_new_string(&_godot_variant, (godot_string *)&s); } -Variant::Variant(const wchar_t * p_wstring) -{ +Variant::Variant(const wchar_t *p_wstring) { String s = p_wstring; - godot::api->godot_variant_new_string(&_godot_variant, (godot_string *) &s); + godot::api->godot_variant_new_string(&_godot_variant, (godot_string *)&s); } -Variant::Variant(const Vector2& p_vector2) -{ - godot::api->godot_variant_new_vector2(&_godot_variant, (godot_vector2 *) &p_vector2); +Variant::Variant(const Vector2 &p_vector2) { + godot::api->godot_variant_new_vector2(&_godot_variant, (godot_vector2 *)&p_vector2); } -Variant::Variant(const Rect2& p_rect2) -{ - godot::api->godot_variant_new_rect2(&_godot_variant, (godot_rect2 *) &p_rect2); +Variant::Variant(const Rect2 &p_rect2) { + godot::api->godot_variant_new_rect2(&_godot_variant, (godot_rect2 *)&p_rect2); } -Variant::Variant(const Vector3& p_vector3) -{ - godot::api->godot_variant_new_vector3(&_godot_variant, (godot_vector3 *) &p_vector3); +Variant::Variant(const Vector3 &p_vector3) { + godot::api->godot_variant_new_vector3(&_godot_variant, (godot_vector3 *)&p_vector3); } -Variant::Variant(const Plane& p_plane) -{ - godot::api->godot_variant_new_plane(&_godot_variant, (godot_plane *) &p_plane); +Variant::Variant(const Plane &p_plane) { + godot::api->godot_variant_new_plane(&_godot_variant, (godot_plane *)&p_plane); } - -Variant::Variant(const AABB& p_aabb) -{ - godot::api->godot_variant_new_aabb(&_godot_variant, (godot_aabb *) &p_aabb); +Variant::Variant(const AABB &p_aabb) { + godot::api->godot_variant_new_aabb(&_godot_variant, (godot_aabb *)&p_aabb); } -Variant::Variant(const Quat& p_quat) -{ - godot::api->godot_variant_new_quat(&_godot_variant, (godot_quat *) &p_quat); +Variant::Variant(const Quat &p_quat) { + godot::api->godot_variant_new_quat(&_godot_variant, (godot_quat *)&p_quat); } -Variant::Variant(const Basis& p_transform) -{ - godot::api->godot_variant_new_basis(&_godot_variant, (godot_basis *) &p_transform); +Variant::Variant(const Basis &p_transform) { + godot::api->godot_variant_new_basis(&_godot_variant, (godot_basis *)&p_transform); } -Variant::Variant(const Transform2D& p_transform) -{ - godot::api->godot_variant_new_transform2d(&_godot_variant, (godot_transform2d *) &p_transform); +Variant::Variant(const Transform2D &p_transform) { + godot::api->godot_variant_new_transform2d(&_godot_variant, (godot_transform2d *)&p_transform); } -Variant::Variant(const Transform& p_transform) -{ - godot::api->godot_variant_new_transform(&_godot_variant, (godot_transform *) &p_transform); +Variant::Variant(const Transform &p_transform) { + godot::api->godot_variant_new_transform(&_godot_variant, (godot_transform *)&p_transform); } -Variant::Variant(const Color& p_color) -{ - godot::api->godot_variant_new_color(&_godot_variant, (godot_color *) &p_color); +Variant::Variant(const Color &p_color) { + godot::api->godot_variant_new_color(&_godot_variant, (godot_color *)&p_color); } -Variant::Variant(const NodePath& p_path) -{ - godot::api->godot_variant_new_node_path(&_godot_variant, (godot_node_path *) &p_path); +Variant::Variant(const NodePath &p_path) { + godot::api->godot_variant_new_node_path(&_godot_variant, (godot_node_path *)&p_path); } -Variant::Variant(const RID& p_rid) -{ - godot::api->godot_variant_new_rid(&_godot_variant, (godot_rid *) &p_rid); +Variant::Variant(const RID &p_rid) { + godot::api->godot_variant_new_rid(&_godot_variant, (godot_rid *)&p_rid); } -Variant::Variant(const Object* p_object) -{ +Variant::Variant(const Object *p_object) { if (p_object) godot::api->godot_variant_new_object(&_godot_variant, p_object->_owner); else godot::api->godot_variant_new_nil(&_godot_variant); } -Variant::Variant(const Dictionary& p_dictionary) -{ - godot::api->godot_variant_new_dictionary(&_godot_variant, (godot_dictionary *) &p_dictionary); +Variant::Variant(const Dictionary &p_dictionary) { + godot::api->godot_variant_new_dictionary(&_godot_variant, (godot_dictionary *)&p_dictionary); } -Variant::Variant(const Array& p_array) -{ - godot::api->godot_variant_new_array(&_godot_variant, (godot_array *) &p_array); +Variant::Variant(const Array &p_array) { + godot::api->godot_variant_new_array(&_godot_variant, (godot_array *)&p_array); } -Variant::Variant(const PoolByteArray& p_raw_array) -{ - godot::api->godot_variant_new_pool_byte_array(&_godot_variant, (godot_pool_byte_array *) &p_raw_array); +Variant::Variant(const PoolByteArray &p_raw_array) { + godot::api->godot_variant_new_pool_byte_array(&_godot_variant, (godot_pool_byte_array *)&p_raw_array); } -Variant::Variant(const PoolIntArray& p_int_array) -{ - godot::api->godot_variant_new_pool_int_array(&_godot_variant, (godot_pool_int_array *) &p_int_array); +Variant::Variant(const PoolIntArray &p_int_array) { + godot::api->godot_variant_new_pool_int_array(&_godot_variant, (godot_pool_int_array *)&p_int_array); } -Variant::Variant(const PoolRealArray& p_real_array) -{ - godot::api->godot_variant_new_pool_real_array(&_godot_variant, (godot_pool_real_array *) &p_real_array); +Variant::Variant(const PoolRealArray &p_real_array) { + godot::api->godot_variant_new_pool_real_array(&_godot_variant, (godot_pool_real_array *)&p_real_array); } -Variant::Variant(const PoolStringArray& p_string_array) -{ - godot::api->godot_variant_new_pool_string_array(&_godot_variant, (godot_pool_string_array *) &p_string_array); +Variant::Variant(const PoolStringArray &p_string_array) { + godot::api->godot_variant_new_pool_string_array(&_godot_variant, (godot_pool_string_array *)&p_string_array); } -Variant::Variant(const PoolVector2Array& p_vector2_array) -{ - godot::api->godot_variant_new_pool_vector2_array(&_godot_variant, (godot_pool_vector2_array *) &p_vector2_array); +Variant::Variant(const PoolVector2Array &p_vector2_array) { + godot::api->godot_variant_new_pool_vector2_array(&_godot_variant, (godot_pool_vector2_array *)&p_vector2_array); } -Variant::Variant(const PoolVector3Array& p_vector3_array) -{ - godot::api->godot_variant_new_pool_vector3_array(&_godot_variant, (godot_pool_vector3_array *) &p_vector3_array); +Variant::Variant(const PoolVector3Array &p_vector3_array) { + godot::api->godot_variant_new_pool_vector3_array(&_godot_variant, (godot_pool_vector3_array *)&p_vector3_array); } -Variant::Variant(const PoolColorArray& p_color_array) -{ - godot::api->godot_variant_new_pool_color_array(&_godot_variant, (godot_pool_color_array *) &p_color_array); +Variant::Variant(const PoolColorArray &p_color_array) { + godot::api->godot_variant_new_pool_color_array(&_godot_variant, (godot_pool_color_array *)&p_color_array); } - -Variant &Variant::operator =(const Variant& v) -{ +Variant &Variant::operator=(const Variant &v) { godot::api->godot_variant_new_copy(&_godot_variant, &v._godot_variant); return *this; } - -Variant::operator bool() const -{ +Variant::operator bool() const { return booleanize(); } -Variant::operator signed int() const -{ +Variant::operator signed int() const { return godot::api->godot_variant_as_int(&_godot_variant); } Variant::operator unsigned int() const // this is the real one { return godot::api->godot_variant_as_uint(&_godot_variant); } -Variant::operator signed short() const -{ +Variant::operator signed short() const { return godot::api->godot_variant_as_int(&_godot_variant); } -Variant::operator unsigned short() const -{ +Variant::operator unsigned short() const { return godot::api->godot_variant_as_uint(&_godot_variant); } -Variant::operator signed char() const -{ +Variant::operator signed char() const { return godot::api->godot_variant_as_int(&_godot_variant); } -Variant::operator unsigned char() const -{ +Variant::operator unsigned char() const { return godot::api->godot_variant_as_uint(&_godot_variant); } -Variant::operator int64_t() const -{ +Variant::operator int64_t() const { return godot::api->godot_variant_as_int(&_godot_variant); } -Variant::operator uint64_t() const -{ +Variant::operator uint64_t() const { return godot::api->godot_variant_as_uint(&_godot_variant); } - -Variant::operator wchar_t() const -{ +Variant::operator wchar_t() const { return godot::api->godot_variant_as_int(&_godot_variant); } -Variant::operator float() const -{ +Variant::operator float() const { return godot::api->godot_variant_as_real(&_godot_variant); } -Variant::operator double() const -{ +Variant::operator double() const { return godot::api->godot_variant_as_real(&_godot_variant); } -Variant::operator String() const -{ +Variant::operator String() const { godot_string s = godot::api->godot_variant_as_string(&_godot_variant); - return *(String *) &s; + return *(String *)&s; } -Variant::operator Vector2() const -{ +Variant::operator Vector2() const { godot_vector2 s = godot::api->godot_variant_as_vector2(&_godot_variant); - return *(Vector2 *) &s; + return *(Vector2 *)&s; } -Variant::operator Rect2() const -{ +Variant::operator Rect2() const { godot_rect2 s = godot::api->godot_variant_as_rect2(&_godot_variant); - return *(Rect2 *) &s; + return *(Rect2 *)&s; } -Variant::operator Vector3() const -{ +Variant::operator Vector3() const { godot_vector3 s = godot::api->godot_variant_as_vector3(&_godot_variant); - return *(Vector3 *) &s; + return *(Vector3 *)&s; } -Variant::operator Plane() const -{ +Variant::operator Plane() const { godot_plane s = godot::api->godot_variant_as_plane(&_godot_variant); - return *(Plane *) &s; + return *(Plane *)&s; } -Variant::operator AABB() const -{ +Variant::operator AABB() const { godot_aabb s = godot::api->godot_variant_as_aabb(&_godot_variant); - return *(AABB *) &s; + return *(AABB *)&s; } -Variant::operator Quat() const -{ +Variant::operator Quat() const { godot_quat s = godot::api->godot_variant_as_quat(&_godot_variant); - return *(Quat *) &s; + return *(Quat *)&s; } -Variant::operator Basis() const -{ +Variant::operator Basis() const { godot_basis s = godot::api->godot_variant_as_basis(&_godot_variant); - return *(Basis *) &s; + return *(Basis *)&s; } -Variant::operator Transform() const -{ +Variant::operator Transform() const { godot_transform s = godot::api->godot_variant_as_transform(&_godot_variant); - return *(Transform *) &s; + return *(Transform *)&s; } -Variant::operator Transform2D() const -{ +Variant::operator Transform2D() const { godot_transform2d s = godot::api->godot_variant_as_transform2d(&_godot_variant); - return *(Transform2D *) &s; + return *(Transform2D *)&s; } -Variant::operator Color() const -{ +Variant::operator Color() const { godot_color s = godot::api->godot_variant_as_color(&_godot_variant); - return *(Color *) &s; + return *(Color *)&s; } -Variant::operator NodePath() const -{ +Variant::operator NodePath() const { godot_node_path s = godot::api->godot_variant_as_node_path(&_godot_variant); - return *(NodePath *) &s; + return *(NodePath *)&s; } -Variant::operator RID() const -{ +Variant::operator RID() const { godot_rid s = godot::api->godot_variant_as_rid(&_godot_variant); - return *(RID *) &s; + return *(RID *)&s; } -Variant::operator Dictionary() const -{ +Variant::operator Dictionary() const { godot_dictionary d = godot::api->godot_variant_as_dictionary(&_godot_variant); - return *(Dictionary *) &d; + return *(Dictionary *)&d; } -Variant::operator Array() const -{ +Variant::operator Array() const { godot_array s = godot::api->godot_variant_as_array(&_godot_variant); - return *(Array *) &s; + return *(Array *)&s; } -Variant::operator PoolByteArray() const -{ +Variant::operator PoolByteArray() const { godot_pool_byte_array s = godot::api->godot_variant_as_pool_byte_array(&_godot_variant); - return *(PoolByteArray *) &s; + return *(PoolByteArray *)&s; } -Variant::operator PoolIntArray() const -{ +Variant::operator PoolIntArray() const { godot_pool_int_array s = godot::api->godot_variant_as_pool_int_array(&_godot_variant); - return *(PoolIntArray *) &s; + return *(PoolIntArray *)&s; } -Variant::operator PoolRealArray() const -{ +Variant::operator PoolRealArray() const { godot_pool_real_array s = godot::api->godot_variant_as_pool_real_array(&_godot_variant); - return *(PoolRealArray *) &s; + return *(PoolRealArray *)&s; } -Variant::operator PoolStringArray() const -{ +Variant::operator PoolStringArray() const { godot_pool_string_array s = godot::api->godot_variant_as_pool_string_array(&_godot_variant); - return *(PoolStringArray *) &s; + return *(PoolStringArray *)&s; } -Variant::operator PoolVector2Array() const -{ +Variant::operator PoolVector2Array() const { godot_pool_vector2_array s = godot::api->godot_variant_as_pool_vector2_array(&_godot_variant); - return *(PoolVector2Array *) &s; + return *(PoolVector2Array *)&s; } -Variant::operator PoolVector3Array() const -{ +Variant::operator PoolVector3Array() const { godot_pool_vector3_array s = godot::api->godot_variant_as_pool_vector3_array(&_godot_variant); - return *(PoolVector3Array *) &s; + return *(PoolVector3Array *)&s; } -Variant::operator PoolColorArray() const -{ +Variant::operator PoolColorArray() const { godot_pool_color_array s = godot::api->godot_variant_as_pool_color_array(&_godot_variant); - return *(PoolColorArray *) &s; + return *(PoolColorArray *)&s; } -Variant::operator godot_object*() const { +Variant::operator godot_object *() const { return godot::api->godot_variant_as_object(&_godot_variant); } -Variant::Type Variant::get_type() const -{ - return (Type) godot::api->godot_variant_get_type(&_godot_variant); +Variant::Type Variant::get_type() const { + return (Type)godot::api->godot_variant_get_type(&_godot_variant); } - -Variant Variant::call(const String& method, const Variant **args, const int arg_count) -{ +Variant Variant::call(const String &method, const Variant **args, const int arg_count) { Variant v; - *(godot_variant *) &v = godot::api->godot_variant_call(&_godot_variant, (godot_string *) &method, (const godot_variant **)args, arg_count, nullptr); + *(godot_variant *)&v = godot::api->godot_variant_call(&_godot_variant, (godot_string *)&method, (const godot_variant **)args, arg_count, nullptr); return v; } -bool Variant::has_method(const String& method) -{ - return godot::api->godot_variant_has_method(&_godot_variant, (godot_string *) &method); +bool Variant::has_method(const String &method) { + return godot::api->godot_variant_has_method(&_godot_variant, (godot_string *)&method); } -bool Variant::operator ==(const Variant& b) const -{ +bool Variant::operator==(const Variant &b) const { return godot::api->godot_variant_operator_equal(&_godot_variant, &b._godot_variant); } -bool Variant::operator !=(const Variant& b) const -{ +bool Variant::operator!=(const Variant &b) const { return !(*this == b); } -bool Variant::operator <(const Variant& b) const -{ +bool Variant::operator<(const Variant &b) const { return godot::api->godot_variant_operator_less(&_godot_variant, &b._godot_variant); } -bool Variant::operator <=(const Variant& b) const -{ +bool Variant::operator<=(const Variant &b) const { return (*this < b) || (*this == b); } -bool Variant::operator >(const Variant& b) const -{ +bool Variant::operator>(const Variant &b) const { return !(*this <= b); } -bool Variant::operator >=(const Variant& b) const -{ +bool Variant::operator>=(const Variant &b) const { return !(*this < b); } -bool Variant::hash_compare(const Variant& b) const -{ +bool Variant::hash_compare(const Variant &b) const { return godot::api->godot_variant_hash_compare(&_godot_variant, &b._godot_variant); } -bool Variant::booleanize() const -{ +bool Variant::booleanize() const { return godot::api->godot_variant_booleanize(&_godot_variant); } -Variant::~Variant() -{ +Variant::~Variant() { godot::api->godot_variant_destroy(&_godot_variant); } - - -} - +} // namespace godot |