improved const-ness of find/Find functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
28b6885216
commit
22d080f35b
@ -157,7 +157,7 @@ enum wxKeyType
|
|||||||
dummy(); \
|
dummy(); \
|
||||||
}; \
|
}; \
|
||||||
protected: \
|
protected: \
|
||||||
iterator find( elT e ) \
|
iterator find( const elT e ) \
|
||||||
{ \
|
{ \
|
||||||
iterator it, en; \
|
iterator it, en; \
|
||||||
for( it = begin(), en = end(); it != en; ++it ) \
|
for( it = begin(), en = end(); it != en; ++it ) \
|
||||||
@ -188,7 +188,7 @@ enum wxKeyType
|
|||||||
{ \
|
{ \
|
||||||
erase( it.m_iter ); \
|
erase( it.m_iter ); \
|
||||||
} \
|
} \
|
||||||
citer Find( elT e ) const { return citer( this, ((liT*)this)->find( e ) ); } \
|
citer Find( const elT e ) const { return citer( this, ((liT*)this)->find( e ) ); } \
|
||||||
citer Member( elT e ) const { return Find( e ); } \
|
citer Member( elT e ) const { return Find( e ); } \
|
||||||
citer Insert( elT e ) \
|
citer Insert( elT e ) \
|
||||||
{ push_front( e ); return citer( this, begin() ); } \
|
{ push_front( e ); return citer( this, begin() ); } \
|
||||||
@ -497,7 +497,7 @@ protected:
|
|||||||
|
|
||||||
// search (all return NULL if item not found)
|
// search (all return NULL if item not found)
|
||||||
// by data
|
// by data
|
||||||
wxNodeBase *Find(void *object) const;
|
wxNodeBase *Find(const void *object) const;
|
||||||
|
|
||||||
// by key
|
// by key
|
||||||
wxNodeBase *Find(const wxListKey& key) const;
|
wxNodeBase *Find(const wxListKey& key) const;
|
||||||
@ -647,7 +647,7 @@ private:
|
|||||||
void Erase(compatibility_iterator it) \
|
void Erase(compatibility_iterator it) \
|
||||||
{ DeleteNode(it); } \
|
{ DeleteNode(it); } \
|
||||||
\
|
\
|
||||||
nodetype *Find(Tbase *object) const \
|
nodetype *Find(const Tbase *object) const \
|
||||||
{ return (nodetype *)wxListBase::Find(object); } \
|
{ return (nodetype *)wxListBase::Find(object); } \
|
||||||
\
|
\
|
||||||
virtual nodetype *Find(const wxListKey& key) const \
|
virtual nodetype *Find(const wxListKey& key) const \
|
||||||
|
@ -345,7 +345,7 @@ wxNodeBase *wxListBase::Find(const wxListKey& key) const
|
|||||||
return (wxNodeBase *)NULL;
|
return (wxNodeBase *)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxNodeBase *wxListBase::Find(void *object) const
|
wxNodeBase *wxListBase::Find(const void *object) const
|
||||||
{
|
{
|
||||||
for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
|
for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user