mewin/godot-cpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NULL -> nullptr

Browse Source
This commit is contained in:
Nickolai Korshunov
2018-02-23 16:08:36 +03:00
parent 3f8456135f
commit f1c35f24f6
7 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/core/Ref.hpp
View File

@@ -13,7 +13,7 @@ class Object;
template <class T>
class Ref {
T *reference = NULL;
T *reference = nullptr;
void ref(const Ref &p_from) {
@@ -102,7 +102,7 @@ public:
//r.reference = Object::cast_to<T>(refb);
r.reference = (T*)refb;
ref(r);
r.reference = NULL;
r.reference = nullptr;
}
void operator=(const Variant &p_variant) {
@@ -118,19 +118,19 @@ public:
//r.reference = Object::cast_to<T>(refb);
r.reference = (T *)refb;
ref(r);
r.reference = NULL;
r.reference = nullptr;
}
Ref(const Ref &p_from) {
reference = NULL;
reference = nullptr;
ref(p_from);
}
template <class T_Other>
Ref(const Ref<T_Other> &p_from) {
reference = NULL;
reference = nullptr;
// TODO We need a safe cast
Reference *refb = const_cast<Reference *>(static_cast<const Reference *>(p_from.ptr()));
if (!refb) {
@@ -142,7 +142,7 @@ public:
//r.reference = Object::cast_to<T>(refb);
r.reference = (T *)refb;
ref(r);
r.reference = NULL;
r.reference = nullptr;
}
Ref(T *p_reference) {
@@ -150,12 +150,12 @@ public:
if (p_reference)
ref_pointer(p_reference);
else
reference = NULL;
reference = nullptr;
}
Ref(const Variant &p_variant) {
reference = NULL;
reference = nullptr;
// TODO We need a safe cast
Reference *refb = (Reference *) (Object *) p_variant;
if (!refb) {
@@ -167,11 +167,11 @@ public:
//r.reference = Object::cast_to<T>(refb);
r.reference = (T *)refb;
ref(r);
r.reference = NULL;
r.reference = nullptr;
}
inline bool is_valid() const { return reference != NULL; }
inline bool is_null() const { return reference == NULL; }
inline bool is_valid() const { return reference != nullptr; }
inline bool is_null() const { return reference == nullptr; }
void unref() {
//TODO this should be moved to mutexes, since this engine does not really
@@ -183,7 +183,7 @@ public:
//memdelete(reference);
delete reference;
}
reference = NULL;
reference = nullptr;
}
void instance() {
@@ -193,7 +193,7 @@ public:
Ref() {
reference = NULL;
reference = nullptr;
}
~Ref() {