Skip to content

Commit 862d1f1

Browse files
akien-mgaakien-mga
authored
Merge pull request #823 from Faless/fix/godot_namespace_requirement
2 parents 02cdec2 + bcf27d8 commit 862d1f1

File tree

3 files changed

+228
-228
lines changed

3 files changed

+228
-228
lines changed

‎include/godot_cpp/classes/wrapped.hpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,32 +117,32 @@ protected:
117117
return &m_class::_bind_methods; \
118118
} \
119119
\
120-
static void (Wrapped::*_get_notification())(int) { \
121-
return (void(Wrapped::*)(int)) & m_class::_notification; \
120+
static void (::godot::Wrapped::*_get_notification())(int) { \
121+
return (void(::godot::Wrapped::*)(int)) & m_class::_notification; \
122122
} \
123123
\
124-
static bool (Wrapped::*_get_set())(const StringName &p_name, const Variant &p_property) { \
125-
return (bool(Wrapped::*)(const StringName &p_name, const Variant &p_property)) & m_class::_set; \
124+
static bool (::godot::Wrapped::*_get_set())(const ::godot::StringName &p_name, const ::godot::Variant &p_property) { \
125+
return (bool(::godot::Wrapped::*)(const ::godot::StringName &p_name, const ::godot::Variant &p_property)) & m_class::_set; \
126126
} \
127127
\
128-
static bool (Wrapped::*_get_get())(const StringName &p_name, Variant &r_ret) { \
129-
return (bool(Wrapped::*)(const StringName &p_name, Variant &r_ret)) & m_class::_set; \
128+
static bool (::godot::Wrapped::*_get_get())(const ::godot::StringName &p_name, ::godot::Variant &r_ret) { \
129+
return (bool(::godot::Wrapped::*)(const ::godot::StringName &p_name, ::godot::Variant &r_ret)) & m_class::_set; \
130130
} \
131131
\
132-
static void (Wrapped::*_get_get_property_list())(List<PropertyInfo> * p_list) { \
133-
return (void(Wrapped::*)(List<PropertyInfo> * p_list)) & m_class::_get_property_list; \
132+
static void (::godot::Wrapped::*_get_get_property_list())(::godot::List<::godot::PropertyInfo> * p_list) { \
133+
return (void(::godot::Wrapped::*)(::godot::List<::godot::PropertyInfo> * p_list)) & m_class::_get_property_list; \
134134
} \
135135
\
136-
static bool (Wrapped::*_get_property_can_revert())(const StringName &p_name) { \
137-
return (bool(Wrapped::*)(const StringName &p_name)) & m_class::_property_can_revert; \
136+
static bool (::godot::Wrapped::*_get_property_can_revert())(const ::godot::StringName &p_name) { \
137+
return (bool(::godot::Wrapped::*)(const ::godot::StringName &p_name)) & m_class::_property_can_revert; \
138138
} \
139139
\
140-
static bool (Wrapped::*_get_property_get_revert())(const StringName &p_name, Variant &) { \
141-
return (bool(Wrapped::*)(const StringName &p_name, Variant &)) & m_class::_property_get_revert; \
140+
static bool (::godot::Wrapped::*_get_property_get_revert())(const ::godot::StringName &p_name, ::godot::Variant &) { \
141+
return (bool(::godot::Wrapped::*)(const ::godot::StringName &p_name, ::godot::Variant &)) & m_class::_property_get_revert; \
142142
} \
143143
\
144-
static String (Wrapped::*_get_to_string())() { \
145-
return (String(Wrapped::*)()) & m_class::_to_string; \
144+
static ::godot::String (::godot::Wrapped::*_get_to_string())() { \
145+
return (::godot::String(::godot::Wrapped::*)()) & m_class::_to_string; \
146146
} \
147147
\
148148
template <class T> \
@@ -191,7 +191,7 @@ public:
191191
if (p_instance && m_class::_get_set()) { \
192192
if (m_class::_get_set() != m_inherits::_get_set()) { \
193193
m_class *cls = reinterpret_cast<m_class *>(p_instance); \
194-
return cls->_set(*reinterpret_cast<const StringName *>(p_name), *reinterpret_cast<const Variant *>(p_value)); \
194+
return cls->_set(*reinterpret_cast<const ::godot::StringName *>(p_name), *reinterpret_cast<const ::godot::Variant *>(p_value)); \
195195
} \
196196
return m_inherits::set_bind(p_instance, p_name, p_value); \
197197
} \
@@ -202,7 +202,7 @@ public:
202202
if (p_instance && m_class::_get_get()) { \
203203
if (m_class::_get_get() != m_inherits::_get_get()) { \
204204
m_class *cls = reinterpret_cast<m_class *>(p_instance); \
205-
return cls->_get(*reinterpret_cast<const StringName *>(p_name), *reinterpret_cast<Variant *>(r_ret)); \
205+
return cls->_get(*reinterpret_cast<const ::godot::StringName *>(p_name), *reinterpret_cast<::godot::Variant *>(r_ret)); \
206206
} \
207207
return m_inherits::get_bind(p_instance, p_name, r_ret); \
208208
} \
@@ -213,12 +213,12 @@ public:
213213
if (p_instance && m_class::_get_get_property_list()) { \
214214
if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) { \
215215
m_class *cls = reinterpret_cast<m_class *>(p_instance); \
216-
List<PropertyInfo> list; \
216+
::godot::List<::godot::PropertyInfo> list; \
217217
cls->_get_property_list(&list); \
218218
ERR_FAIL_COND_V_MSG(cls->plist != nullptr || cls->plist_size != 0, nullptr, "Internal error, property list was not freed by engine!"); \
219219
cls->plist = reinterpret_cast<GDNativePropertyInfo *>(memalloc(sizeof(GDNativePropertyInfo) * list.size())); \
220220
cls->plist_size = 0; \
221-
for (const PropertyInfo &E : list) { \
221+
for (const ::godot::PropertyInfo &E : list) { \
222222
cls->plist[cls->plist_size].type = E.type; \
223223
cls->plist[cls->plist_size].name = _alloc_and_copy_cstr(E.name); \
224224
cls->plist[cls->plist_size].hint = E.hint; \
@@ -255,7 +255,7 @@ public:
255255
if (p_instance && m_class::_get_property_can_revert()) { \
256256
if (m_class::_get_property_can_revert() != m_inherits::_get_property_can_revert()) { \
257257
m_class *cls = reinterpret_cast<m_class *>(p_instance); \
258-
return cls->_property_can_revert(*reinterpret_cast<const StringName *>(p_name)); \
258+
return cls->_property_can_revert(*reinterpret_cast<const ::godot::StringName *>(p_name)); \
259259
} \
260260
return m_inherits::property_can_revert_bind(p_instance, p_name); \
261261
} \
@@ -266,7 +266,7 @@ public:
266266
if (p_instance && m_class::_get_property_get_revert()) { \
267267
if (m_class::_get_property_get_revert() != m_inherits::_get_property_get_revert()) { \
268268
m_class *cls = reinterpret_cast<m_class *>(p_instance); \
269-
return cls->_property_get_revert(*reinterpret_cast<const StringName *>(p_name), *reinterpret_cast<Variant *>(r_ret)); \
269+
return cls->_property_get_revert(*reinterpret_cast<const ::godot::StringName *>(p_name), *reinterpret_cast<::godot::Variant *>(r_ret)); \
270270
} \
271271
return m_inherits::property_get_revert_bind(p_instance, p_name, r_ret); \
272272
} \
@@ -277,7 +277,7 @@ public:
277277
if (p_instance && m_class::_get_to_string()) { \
278278
if (m_class::_get_to_string() != m_inherits::_get_to_string()) { \
279279
m_class *cls = reinterpret_cast<m_class *>(p_instance); \
280-
*reinterpret_cast<String *>(r_out) = cls->_to_string(); \
280+
*reinterpret_cast<::godot::String *>(r_out) = cls->_to_string(); \
281281
return; \
282282
} \
283283
m_inherits::to_string_bind(p_instance, r_out); \

0 commit comments

Comments
 (0)