LLMenuGL::getItemCount should be const and return size_type
Also put it in the header.
This commit is contained in:
@@ -3333,11 +3333,6 @@ void LLMenuGL::setTornOff(BOOL torn_off)
|
||||
mTornOff = torn_off;
|
||||
}
|
||||
|
||||
U32 LLMenuGL::getItemCount()
|
||||
{
|
||||
return mItems.size();
|
||||
}
|
||||
|
||||
LLMenuItemGL* LLMenuGL::getItem(S32 number)
|
||||
{
|
||||
if (number >= 0 && number < (S32)mItems.size())
|
||||
|
||||
@@ -536,8 +536,10 @@ public:
|
||||
typedef std::list<LLMenuItemGL*> item_list_t;
|
||||
item_list_t::iterator find(LLMenuItemGL* item) { return std::find(mItems.begin(), mItems.end(), item); }
|
||||
|
||||
// number of menu items
|
||||
item_list_t::size_type LLMenuGL::getItemCount() const { return mItems.size(); }
|
||||
|
||||
void setItemLastSelected(LLMenuItemGL* item); // must be in menu
|
||||
U32 getItemCount(); // number of menu items
|
||||
LLMenuItemGL* getItem(S32 number); // 0 = first item
|
||||
LLMenuItemGL* getHighlightedItem();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user