solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Initialize wxWeakRef members in their declarations

Browse source 
Instead of doing it in all ctors initializer lists.

No real changes.
This commit is contained in:
Vadim Zeitlin 2023-04-17 18:43:02 +02:00
parent d03fc649ab
commit 9a52a15e26
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/wx/weakref.h
View file

@ -31,11 +31,11 @@ public:
typedef T element_type; typedef T element_type;
// Default ctor // Default ctor
wxWeakRef() : m_pobj(nullptr), m_ptbase(nullptr) { } wxWeakRef() = default;
// Ctor from the object of this type: this is needed as the template ctor // Ctor from the object of this type: this is needed as the template ctor
// below is not used by at least g++4 when a literal NULL is used // below is not used by at least g++4 when a literal NULL is used
wxWeakRef(T *pobj) : m_pobj(nullptr), m_ptbase(nullptr) wxWeakRef(T *pobj)
{ {
this->Assign(pobj); this->Assign(pobj);
} }
@ -43,14 +43,14 @@ public:
// When we have the full type here, static_cast<> will always work // When we have the full type here, static_cast<> will always work
// (or give a straight compiler error). // (or give a straight compiler error).
template <class TDerived> template <class TDerived>
wxWeakRef(TDerived* pobj) : m_pobj(nullptr), m_ptbase(nullptr) wxWeakRef(TDerived* pobj)
{ {
this->Assign(pobj); this->Assign(pobj);
} }
// We need this copy ctor, since otherwise a default compiler (binary) copy // We need this copy ctor, since otherwise a default compiler (binary) copy
// happens (if embedded as an object member). // happens (if embedded as an object member).
wxWeakRef(const wxWeakRef<T>& wr) : m_pobj(nullptr), m_ptbase(nullptr) wxWeakRef(const wxWeakRef<T>& wr)
{ {
this->Assign(wr.get()); this->Assign(wr.get());
} }
@ -124,8 +124,8 @@ protected:
} }
} }
T *m_pobj; T *m_pobj = nullptr;
wxTrackable *m_ptbase; wxTrackable *m_ptbase = nullptr;
}; };
@ -137,7 +137,7 @@ template <class T>
class wxWeakRefDynamic : public wxTrackerNode class wxWeakRefDynamic : public wxTrackerNode
{ {
public: public:
wxWeakRefDynamic() : m_pobj(nullptr) { } wxWeakRefDynamic() = default;
wxWeakRefDynamic(T* pobj) : m_pobj(pobj) wxWeakRefDynamic(T* pobj) : m_pobj(pobj)
{ {
@ -209,7 +209,7 @@ protected:
} }
} }
T *m_pobj; T *m_pobj = nullptr;
}; };
#endif // RTTI enabled #endif // RTTI enabled