livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor FSFloaterContacts and say goodbye to LLLocalFriendsObserver

master
Ansariel 2015-11-23 14:52:00 +01:00
parent 8f5028662c
commit 6ca857225a
2 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
indra/newview/fsfloatercontacts.cpp
View File

@ -35,7 +35,6 @@
#include "fsscrolllistctrl.h"
#include "llagent.h"
#include "llavataractions.h"
#include "llcallingcard.h" // for LLAvatarTracker
#include "llfloateravatarpicker.h"
#include "llfloatergroupinvite.h"
#include "llfloaterreg.h"
@ -60,23 +59,6 @@ static const std::string FRIENDS_TAB_NAME = "friends_panel";
static const std::string GROUP_TAB_NAME = "groups_panel";
// simple class to observe the calling cards.
class LLLocalFriendsObserver : public LLFriendObserver
{
public:
LLLocalFriendsObserver(FSFloaterContacts* floater) : mFloater(floater) {}
virtual ~LLLocalFriendsObserver()
{
mFloater = NULL;
}
virtual void changed(U32 mask)
{
mFloater->onFriendListUpdate(mask);
}
protected:
FSFloaterContacts* mFloater;
};
//
// FSFloaterContacts
//
@ -85,7 +67,6 @@ FSFloaterContacts::FSFloaterContacts(const LLSD& seed)
: LLFloater(seed),
LLEventTimer(300.f),
mTabContainer(NULL),
mObserver(NULL),
mFriendsList(NULL),
mGroupList(NULL),
mAllowRightsChange(true),
@ -95,18 +76,16 @@ FSFloaterContacts::FSFloaterContacts(const LLSD& seed)
mResetLastColumnDisplayModeChanged(false),
mDirtyNames(true)
{
mObserver = new LLLocalFriendsObserver(this);
LLAvatarTracker::instance().addObserver(mObserver);
LLAvatarTracker::instance().addObserver(this);
// For notification when SIP online status changes.
LLVoiceClient::getInstance()->addObserver(mObserver);
LLVoiceClient::getInstance()->addObserver(this);
}
FSFloaterContacts::~FSFloaterContacts()
{
// For notification when SIP online status changes.
LLVoiceClient::getInstance()->removeObserver(mObserver);
LLAvatarTracker::instance().removeObserver(mObserver);
delete mObserver;
LLVoiceClient::getInstance()->removeObserver(this);
LLAvatarTracker::instance().removeObserver(this);
if (mRlvBehaviorCallbackConnection.connected())
{
@ -532,7 +511,7 @@ void FSFloaterContacts::sortFriendList()
// Friends list
//
void FSFloaterContacts::onFriendListUpdate(U32 changed_mask)
void FSFloaterContacts::changed(U32 changed_mask)
{
LLAvatarTracker& at = LLAvatarTracker::instance();

14
indra/newview/fsfloatercontacts.h
View File

@ -30,6 +30,7 @@
#define FS_FLOATERCONTACTS_H
#include "llavatarnamecache.h"
#include "llcallingcard.h"
#include "llfloater.h"
#include "llscrolllistcolumn.h"
#include "rlvhandler.h"
@ -37,30 +38,26 @@
class FSScrollListCtrl;
class LLAvatarList;
class LLAvatarTracker;
class LLFriendObserver;
class LLScrollListCtrl;
class LLGroupList;
class LLRelationship;
class LLPanel;
class LLTabContainer;
class FSFloaterContacts : public LLFloater, LLEventTimer
class FSFloaterContacts : public LLFloater, LLFriendObserver, LLEventTimer
{
public:
FSFloaterContacts(const LLSD& seed);
virtual ~FSFloaterContacts();
/**
* @brief This method is called in response to the LLAvatarTracker
* sending out a changed() message.
*/
void onFriendListUpdate(U32 changed_mask);
/*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void draw();
/*virtual*/ BOOL tick();
// LLFriendObserver implementation
/*virtual*/ void changed(U32 changed_mask);
static FSFloaterContacts* getInstance();
static FSFloaterContacts* findInstance();
@ -151,7 +148,6 @@ private:
LLTabContainer* mTabContainer;
LLFriendObserver* mObserver;
bool mAllowRightsChange;
S32 mNumRightsChanged;
bool mRightsChangeNotificationTriggered;