Clean up contacts floater

Author: Ansariel

indra/newview/fsfloatercontacts.cpp

@@ -274,7 +274,7 @@ void FSFloaterContacts::onOpen(const LLSD& key)
         // first set the tear-off host to the conversations container
         setHost(floater_container);
         // clear the tear-off host right after, the "last host used" will still stick
-        setHost(NULL);
+        setHost(nullptr);
         // reparent to floater view
         gFloaterView->addChild(this);
     }
@@ -389,7 +389,7 @@ void FSFloaterContacts::onDeleteFriendButtonClicked()
     }
 }
 
-bool FSFloaterContacts::isItemsFreeOfFriends(const uuid_vec_t& uuids)
+bool FSFloaterContacts::isItemsFreeOfFriends(const uuid_vec_t& uuids) const
 {
     const LLAvatarTracker& av_tracker = LLAvatarTracker::instance();
     for (const auto& id : uuids)
@@ -723,11 +723,7 @@ void FSFloaterContacts::addFriend(const LLUUID& agent_id)
     update_gen_column["column"]             = "friend_last_update_generation";
     update_gen_column["value"]              = relationInfo->getChangeSerialNum();
 
-    mFriendsList->addElement(element, ADD_BOTTOM);
-    if (LLScrollListItem* added_item = mFriendsList->getItem(agent_id); added_item)
-    {
-        updateFriendItemColor(added_item, agent_id);
-    }
+    updateFriendItemColor(mFriendsList->addElement(element, ADD_BOTTOM), agent_id);
 }
 
 void FSFloaterContacts::onMapButtonClicked()
@@ -936,56 +932,52 @@ void FSFloaterContacts::onSelectName()
     applyRightsToFriends();
 }
 
-void FSFloaterContacts::confirmModifyRights(rights_map_t& ids, EGrantRevoke command)
+void FSFloaterContacts::confirmModifyRights(const rights_map_t& ids, EGrantRevoke command)
 {
     if (ids.empty())
     {
         return;
     }
 
     LLSD args;
-    if (ids.size() > 0)
-    {
-        rights_map_t* rights = new rights_map_t(ids);
+    rights_map_t* rights = new rights_map_t(ids);
 
-        // for single friend, show their name
-        if (ids.size() == 1)
+    // for single friend, show their name
+    if (ids.size() == 1)
+    {
+        args["NAME"] = LLSLURL("agent", ids.begin()->first, "completename").getSLURLString();
+        if (command == GRANT)
         {
-            args["NAME"] = LLSLURL("agent", ids.begin()->first, "completename").getSLURLString();
-            if (command == GRANT)
-            {
-                LLNotificationsUtil::add("GrantModifyRights",
-                    args,
-                    LLSD(),
-                    boost::bind(&FSFloaterContacts::modifyRightsConfirmation, this, _1, _2, rights));
-            }
-            else
-            {
-                LLNotificationsUtil::add("RevokeModifyRights",
-                    args,
-                    LLSD(),
-                    boost::bind(&FSFloaterContacts::modifyRightsConfirmation, this, _1, _2, rights));
-            }
+            LLNotificationsUtil::add("GrantModifyRights",
+                args,
+                LLSD(),
+                boost::bind(&FSFloaterContacts::modifyRightsConfirmation, this, _1, _2, rights));
         }
         else
         {
-            if (command == GRANT)
-            {
-                LLNotificationsUtil::add("GrantModifyRightsMultiple",
-                    args,
-                    LLSD(),
-                    boost::bind(&FSFloaterContacts::modifyRightsConfirmation, this, _1, _2, rights));
-            }
-            else
-            {
-                LLNotificationsUtil::add("RevokeModifyRightsMultiple",
-                    args,
-                    LLSD(),
-                    boost::bind(&FSFloaterContacts::modifyRightsConfirmation, this, _1, _2, rights));
-            }
+            LLNotificationsUtil::add("RevokeModifyRights",
+                args,
+                LLSD(),
+                boost::bind(&FSFloaterContacts::modifyRightsConfirmation, this, _1, _2, rights));
+        }
+    }
+    else
+    {
+        if (command == GRANT)
+        {
+            LLNotificationsUtil::add("GrantModifyRightsMultiple",
+                args,
+                LLSD(),
+                boost::bind(&FSFloaterContacts::modifyRightsConfirmation, this, _1, _2, rights));
+        }
+        else
+        {
+            LLNotificationsUtil::add("RevokeModifyRightsMultiple",
+                args,
+                LLSD(),
+                boost::bind(&FSFloaterContacts::modifyRightsConfirmation, this, _1, _2, rights));
         }
     }
-
 }
 
 bool FSFloaterContacts::modifyRightsConfirmation(const LLSD& notification, const LLSD& response, rights_map_t* rights)
@@ -1113,7 +1105,7 @@ void FSFloaterContacts::applyRightsToFriends()
     }
 }
 
-void FSFloaterContacts::sendRightsGrant(rights_map_t& ids)
+void FSFloaterContacts::sendRightsGrant(const rights_map_t& ids)
 {
     if (ids.empty())
     {
@@ -1312,7 +1304,7 @@ void FSFloaterContacts::onDisplayNameChanged()
     mFriendsList->setNeedsSort();
 }
 
-std::string FSFloaterContacts::getFullName(const LLAvatarName& av_name)
+std::string FSFloaterContacts::getFullName(const LLAvatarName& av_name) const
 {
     if (av_name.isDisplayNameDefault() || !gSavedSettings.getBOOL("UseDisplayNames"))
     {

indra/newview/fsfloatercontacts.h

@@ -33,7 +33,6 @@
 #include "llcallingcard.h"
 #include "llfloater.h"
 #include "lggcontactsets.h"
-#include "llscrolllistcolumn.h"
 #include "rlvhandler.h"
 
 class FSScrollListCtrl;
@@ -67,16 +66,16 @@ class FSFloaterContacts : public LLFloater, LLFriendObserver, LLEventTimer
     void openTab(std::string_view name);
     LLPanel* getPanelByName(std::string_view panel_name);
 
-    void                    sortFriendList();
-    void                    onDisplayNameChanged();
-    void                    resetFriendFilter();
+    void sortFriendList();
+    void onDisplayNameChanged();
+    void resetFriendFilter();
 
     // <FS:TJ> [FIRE-35804] Allow the IM floater to have separate transparency
     F32 onGetFilterOpacityCallback(ETypeTransparency type, F32 alpha);
     // </FS:TJ>
 
 private:
-    typedef std::vector<LLScrollListItem*> listitem_vec_t;
+    using listitem_vec_t = std::vector<LLScrollListItem*>;
 
     std::string             getActiveTabName() const;
     LLUUID                  getCurrentItemID() const;
@@ -97,7 +96,7 @@ class FSFloaterContacts : public LLFloater, LLFriendObserver, LLEventTimer
         LIST_FRIEND_UPDATE_GEN
     };
 
-    typedef std::map<LLUUID, S32> rights_map_t;
+    using rights_map_t = std::map<LLUUID, S32>;
     void                    refreshRightsChangeList();
     void                    refreshUI();
     void                    updateFriendCount();
@@ -108,17 +107,17 @@ class FSFloaterContacts : public LLFloater, LLFriendObserver, LLEventTimer
     void                    updateFriendItem(const LLUUID& agent_id, const LLRelationship* relationship, const LLUUID& request_id);
     void                    updateFriendItemColor(LLScrollListItem* item, const LLUUID& agent_id) const;
 
-    typedef enum
+    enum EGrantRevoke
     {
         GRANT,
         REVOKE
-    } EGrantRevoke;
-    void                    confirmModifyRights(rights_map_t& ids, EGrantRevoke command);
-    void                    sendRightsGrant(rights_map_t& ids);
+    };
+    void                    confirmModifyRights(const rights_map_t& ids, EGrantRevoke command);
+    void                    sendRightsGrant(const rights_map_t& ids);
     bool                    modifyRightsConfirmation(const LLSD& notification, const LLSD& response, rights_map_t* rights);
 
 
-    bool                    isItemsFreeOfFriends(const uuid_vec_t& uuids);
+    bool                    isItemsFreeOfFriends(const uuid_vec_t& uuids) const;
 
     // misc callbacks
     static void             onAvatarPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName>& names);
@@ -201,11 +200,11 @@ class FSFloaterContacts : public LLFloater, LLFriendObserver, LLEventTimer
     boost::signals2::connection mRlvBehaviorCallbackConnection{};
     boost::signals2::connection mContactSetChangedConnection{};
 
-    std::string getFullName(const LLAvatarName& av_name);
+    std::string getFullName(const LLAvatarName& av_name) const;
 
     void setDirtyNames(const LLUUID& request_id);
 
-    typedef std::map<LLUUID, LLAvatarNameCache::callback_connection_t> avatar_name_cb_t;
+    using avatar_name_cb_t = std::map<LLUUID, LLAvatarNameCache::callback_connection_t>;
     avatar_name_cb_t    mAvatarNameCacheConnections;
     void                disconnectAvatarNameCacheConnection(const LLUUID& request_id);
 };