Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use annoying and unneeded in C++ casts of NULL to "T *"

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-19 13:39:25 +00:00
parent 41fb347540
commit c23b255ab4
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/list.h
View File

@@ -420,9 +420,9 @@ class WXDLLIMPEXP_BASE wxNodeBase
friend class wxListBase; friend class wxListBase;
public: public:
// ctor // ctor
wxNodeBase(wxListBase *list = (wxListBase *)NULL, wxNodeBase(wxListBase *list = NULL,
wxNodeBase *previous = (wxNodeBase *)NULL, wxNodeBase *previous = NULL,
wxNodeBase *next = (wxNodeBase *)NULL, wxNodeBase *next = NULL,
void *data = NULL, void *data = NULL,
const wxListKey& key = wxDefaultListKey); const wxListKey& key = wxDefaultListKey);
@@ -559,7 +559,7 @@ protected:
{ {
wxNodeBase *node = Item(n); wxNodeBase *node = Item(n);
return node ? node->GetData() : (wxNodeBase *)NULL; return node ? node->GetData() : NULL;
} }
// operations // operations
@@ -569,7 +569,8 @@ protected:
// append to beginning of list // append to beginning of list
wxNodeBase *Append(void *object); wxNodeBase *Append(void *object);
// insert a new item at the beginning of the list // insert a new item at the beginning of the list
wxNodeBase *Insert(void *object) { return Insert( (wxNodeBase*)NULL, object); } wxNodeBase *Insert(void *object)
{ return Insert(static_cast<wxNodeBase *>(NULL), object); }
// insert a new item at the given position // insert a new item at the given position
wxNodeBase *Insert(size_t pos, void *object) wxNodeBase *Insert(size_t pos, void *object)
{ return pos == GetCount() ? Append(object) { return pos == GetCount() ? Append(object)
@@ -673,10 +674,10 @@ private:
classexp nodetype : public wxNodeBase \ classexp nodetype : public wxNodeBase \
{ \ { \
public: \ public: \
nodetype(wxListBase *list = (wxListBase *)NULL, \ nodetype(wxListBase *list = NULL, \
nodetype *previous = (nodetype *)NULL, \ nodetype *previous = NULL, \
nodetype *next = (nodetype *)NULL, \ nodetype *next = NULL, \
T *data = (T *)NULL, \ T *data = NULL, \
const wxListKey& key = wxDefaultListKey) \ const wxListKey& key = wxDefaultListKey) \
: wxNodeBase(list, previous, next, data, key) { } \ : wxNodeBase(list, previous, next, data, key) { } \
\ \
@@ -733,13 +734,14 @@ private:
T *operator[](size_t index) const \ T *operator[](size_t index) const \
{ \ { \
nodetype *node = Item(index); \ nodetype *node = Item(index); \
return node ? (T*)(node->GetData()) : (T*)NULL; \ return node ? (T*)(node->GetData()) : NULL; \
} \ } \
\ \
nodetype *Append(Tbase *object) \ nodetype *Append(Tbase *object) \
{ return (nodetype *)wxListBase::Append(object); } \ { return (nodetype *)wxListBase::Append(object); } \
nodetype *Insert(Tbase *object) \ nodetype *Insert(Tbase *object) \
{ return (nodetype *)Insert((nodetype*)NULL, object); } \ { return (nodetype *)Insert(static_cast<nodetype *>(NULL), \
object); } \
nodetype *Insert(size_t pos, Tbase *object) \ nodetype *Insert(size_t pos, Tbase *object) \
{ return (nodetype *)wxListBase::Insert(pos, object); } \ { return (nodetype *)wxListBase::Insert(pos, object); } \
nodetype *Insert(nodetype *prev, Tbase *object) \ nodetype *Insert(nodetype *prev, Tbase *object) \