From dbf4e1e61f02de515447dce828bfde87a1bc85cc Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 12 Aug 2014 11:56:55 +0200 Subject: [PATCH] Let's just create a type definition for std::vector --- indra/newview/fsfloatercontacts.cpp | 12 ++++++------ indra/newview/fsfloatercontacts.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp index 4526f8b119..28191953fa 100644 --- a/indra/newview/fsfloatercontacts.cpp +++ b/indra/newview/fsfloatercontacts.cpp @@ -486,8 +486,8 @@ void FSFloaterContacts::getCurrentItemIDs(uuid_vec_t& selected_uuids) const void FSFloaterContacts::getCurrentFriendItemIDs(uuid_vec_t& selected_uuids) const { - std::vector selected = mFriendsList->getAllSelected(); - for(std::vector::iterator itr = selected.begin(); itr != selected.end(); ++itr) + listitem_vec_t selected = mFriendsList->getAllSelected(); + for (listitem_vec_t::iterator itr = selected.begin(); itr != selected.end(); ++itr) { selected_uuids.push_back((*itr)->getUUID()); } @@ -921,8 +921,8 @@ void FSFloaterContacts::applyRightsToFriends() EGrantRevoke confirmation_type = GRANT; // this assumes that changes only happened to selected items - std::vector selected = mFriendsList->getAllSelected(); - for (std::vector::iterator itr = selected.begin(); itr != selected.end(); ++itr) + listitem_vec_t selected = mFriendsList->getAllSelected(); + for (listitem_vec_t::iterator itr = selected.begin(); itr != selected.end(); ++itr) { LLUUID id = (*itr)->getValue(); const LLRelationship* buddy_relationship = LLAvatarTracker::instance().getBuddyInfo(id); @@ -1161,8 +1161,8 @@ void FSFloaterContacts::onColumnDisplayModeChanged(const std::string& settings_n void FSFloaterContacts::onDisplayNameChanged() { - std::vector items = mFriendsList->getAllData(); - for (std::vector::iterator it = items.begin(); it != items.end(); ++it) + listitem_vec_t items = mFriendsList->getAllData(); + for (listitem_vec_t::iterator it = items.begin(); it != items.end(); ++it) { LLAvatarName av_name; if (LLAvatarNameCache::get((*it)->getUUID(), &av_name)) diff --git a/indra/newview/fsfloatercontacts.h b/indra/newview/fsfloatercontacts.h index efc69f90e8..2d910facc1 100644 --- a/indra/newview/fsfloatercontacts.h +++ b/indra/newview/fsfloatercontacts.h @@ -75,6 +75,8 @@ public: LLGroupList* mGroupList; private: + typedef std::vector listitem_vec_t; + std::string getActiveTabName() const; LLUUID getCurrentItemID() const; void getCurrentItemIDs(uuid_vec_t& selected_uuids) const;