diff options
| author | Richard Linden <none@none> | 2012-06-20 19:17:54 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-06-20 19:17:54 -0700 |
| commit | c517863b9c0e19507eafc8842e1e68379e6122a9 (patch) | |
| tree | a096c06396ab00a142d62d43671b1eb425484d89 /indra | |
| parent | 316d8fc875d54bfcc7e7eb8d215a4810947bcb71 (diff) | |
CHUI-101 WIP Make LLFolderView general purpose
build fix for gcc
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfolderviewitem.h | 5 | ||||
| -rw-r--r-- | indra/newview/llfolderviewmodel.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h index 1f8c12cf73..feba32e31d 100644 --- a/indra/newview/llfolderviewitem.h +++ b/indra/newview/llfolderviewitem.h @@ -464,7 +464,6 @@ public: std::string& tooltip_msg); virtual void draw(); - folders_t::iterator getFoldersBegin() { return mFolders.begin(); } folders_t::iterator getFoldersEnd() { return mFolders.end(); } folders_t::size_type getFoldersCount() const { return mFolders.size(); } @@ -478,8 +477,8 @@ public: public: //WARNING: do not call directly...use the appropriate LLFolderViewModel-derived class instead - template<typename SORT_FUNC> void sortFolders(SORT_FUNC& func) { mFolders.sort(func); } - template<typename SORT_FUNC> void sortItems(SORT_FUNC& func) { mItems.sort(func); } + template<typename SORT_FUNC> void sortFolders(const SORT_FUNC& func) { mFolders.sort(func); } + template<typename SORT_FUNC> void sortItems(const SORT_FUNC& func) { mItems.sort(func); } }; diff --git a/indra/newview/llfolderviewmodel.h b/indra/newview/llfolderviewmodel.h index 946943530a..930c26384c 100644 --- a/indra/newview/llfolderviewmodel.h +++ b/indra/newview/llfolderviewmodel.h @@ -255,12 +255,12 @@ public: : mSorter(sorter) {} - bool operator () (const LLFolderViewItem* a, const LLFolderViewItem* b) + bool operator () (const LLFolderViewItem* a, const LLFolderViewItem* b) const { return mSorter(static_cast<const ItemType*>(a->getViewModelItem()), static_cast<const ItemType*>(b->getViewModelItem())); } - bool operator () (const LLFolderViewFolder* a, const LLFolderViewFolder* b) + bool operator () (const LLFolderViewFolder* a, const LLFolderViewFolder* b) const { return mSorter(static_cast<const ItemType*>(a->getViewModelItem()), static_cast<const ItemType*>(b->getViewModelItem())); } |