Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix String const operators. 

Added const to various operators.
pull/133/head
Timothy Werquin 2018-05-15 22:23:03 +02:00
parent d8becfbe90
commit 1803ca43fa
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/core/String.hpp
View File

@ -49,15 +49,15 @@ public:
wchar_t operator[](const int idx) const; wchar_t operator[](const int idx) const;
void operator=(const String &s); void operator=(const String &s);
bool operator==(const String &s); bool operator==(const String &s) const;
bool operator!=(const String &s); bool operator!=(const String &s) const;
String operator+(const String &s); String operator+(const String &s) const;
void operator+=(const String &s); void operator+=(const String &s);
void operator+=(const wchar_t c); void operator+=(const wchar_t c) const;
bool operator<(const String &s); bool operator<(const String &s) const;
bool operator<=(const String &s); bool operator<=(const String &s) const;
bool operator>(const String &s); bool operator>(const String &s) const;
bool operator>=(const String &s); bool operator>=(const String &s) const;
operator NodePath() const; operator NodePath() const;

16
src/core/String.cpp
View File

@ -115,15 +115,15 @@ void String::operator=(const String &s) {
godot::api->godot_string_new_copy(&_godot_string, &s._godot_string); godot::api->godot_string_new_copy(&_godot_string, &s._godot_string);
} }
bool String::operator==(const String &s) { bool String::operator==(const String &s) const {
return godot::api->godot_string_operator_equal(&_godot_string, &s._godot_string); return godot::api->godot_string_operator_equal(&_godot_string, &s._godot_string);
} }
bool String::operator!=(const String &s) { bool String::operator!=(const String &s) const {
return !(*this == s); return !(*this == s);
} }
String String::operator+(const String &s) { String String::operator+(const String &s) const {
String new_string = *this; String new_string = *this;
new_string._godot_string = godot::api->godot_string_operator_plus(&new_string._godot_string, &s._godot_string); new_string._godot_string = godot::api->godot_string_operator_plus(&new_string._godot_string, &s._godot_string);
@ -134,24 +134,24 @@ void String::operator+=(const String &s) {
_godot_string = godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string); _godot_string = godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string);
} }
void String::operator+=(const wchar_t c) { void String::operator+=(const wchar_t c) const {
// @Todo // @Todo
} }
bool String::operator<(const String &s) { bool String::operator<(const String &s) const {
return godot::api->godot_string_operator_less(&_godot_string, &s._godot_string); return godot::api->godot_string_operator_less(&_godot_string, &s._godot_string);
} }
bool String::operator<=(const String &s) { bool String::operator<=(const String &s) const {
return godot::api->godot_string_operator_less(&_godot_string, &s._godot_string) || return godot::api->godot_string_operator_less(&_godot_string, &s._godot_string) ||
(*this == s); (*this == s);
} }
bool String::operator>(const String &s) { bool String::operator>(const String &s) const {
return !(*this <= s); return !(*this <= s);
} }
bool String::operator>=(const String &s) { bool String::operator>=(const String &s) const {
return !(*this < s); return !(*this < s);
} }