From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- indra/newview/llnamelistctrl.h | 244 ++++++++++++++++++++--------------------- 1 file changed, 122 insertions(+), 122 deletions(-) (limited to 'indra/newview/llnamelistctrl.h') diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index 4a4bd4ba09..111b8d1077 100644 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -42,143 +42,143 @@ class LLAvatarName; class LLNameListItem : public LLScrollListItem, public LLHandleProvider { public: - bool isGroup() const { return mIsGroup; } - void setIsGroup(bool is_group) { mIsGroup = is_group; } - bool isExperience() const { return mIsExperience; } - void setIsExperience(bool is_experience) { mIsExperience = is_experience; } + bool isGroup() const { return mIsGroup; } + void setIsGroup(bool is_group) { mIsGroup = is_group; } + bool isExperience() const { return mIsExperience; } + void setIsExperience(bool is_experience) { mIsExperience = is_experience; } void setSpecialID(const LLUUID& special_id) { mSpecialID = special_id; } const LLUUID& getSpecialID() const { return mSpecialID; } protected: - friend class LLNameListCtrl; + friend class LLNameListCtrl; - LLNameListItem( const LLScrollListItem::Params& p ) - : LLScrollListItem(p), mIsGroup(false), mIsExperience(false) - { - } + LLNameListItem( const LLScrollListItem::Params& p ) + : LLScrollListItem(p), mIsGroup(false), mIsExperience(false) + { + } - LLNameListItem( const LLScrollListItem::Params& p, bool is_group ) - : LLScrollListItem(p), mIsGroup(is_group), mIsExperience(false) - { - } + LLNameListItem( const LLScrollListItem::Params& p, bool is_group ) + : LLScrollListItem(p), mIsGroup(is_group), mIsExperience(false) + { + } - LLNameListItem( const LLScrollListItem::Params& p, bool is_group, bool is_experience ) - : LLScrollListItem(p), mIsGroup(is_group), mIsExperience(is_experience) - { - } + LLNameListItem( const LLScrollListItem::Params& p, bool is_group, bool is_experience ) + : LLScrollListItem(p), mIsGroup(is_group), mIsExperience(is_experience) + { + } private: - bool mIsGroup; - bool mIsExperience; + bool mIsGroup; + bool mIsExperience; LLUUID mSpecialID; }; class LLNameListCtrl -: public LLScrollListCtrl, public LLInstanceTracker +: public LLScrollListCtrl, public LLInstanceTracker { public: - typedef boost::signals2::signal namelist_complete_signal_t; - - typedef enum e_name_type - { - INDIVIDUAL, - GROUP, - SPECIAL, - EXPERIENCE - } ENameType; - - // provide names for enums - struct NameTypeNames : public LLInitParam::TypeValuesHelper - { - static void declareValues(); - }; - - struct NameItem : public LLInitParam::Block - { - Optional name; - Optional target; + typedef boost::signals2::signal namelist_complete_signal_t; + + typedef enum e_name_type + { + INDIVIDUAL, + GROUP, + SPECIAL, + EXPERIENCE + } ENameType; + + // provide names for enums + struct NameTypeNames : public LLInitParam::TypeValuesHelper + { + static void declareValues(); + }; + + struct NameItem : public LLInitParam::Block + { + Optional name; + Optional target; Optional special_id; - NameItem() - : name("name"), - target("target", INDIVIDUAL), + NameItem() + : name("name"), + target("target", INDIVIDUAL), special_id("special_id", LLUUID()) - {} - }; - - struct NameColumn : public LLInitParam::ChoiceBlock - { - Alternative column_index; - Alternative column_name; - NameColumn() - : column_name("name_column"), - column_index("name_column_index", 0) - {} - }; - - struct Params : public LLInitParam::Block - { - Optional name_column; - Optional allow_calling_card_drop; - Optional short_names; - Params(); - }; + {} + }; + + struct NameColumn : public LLInitParam::ChoiceBlock + { + Alternative column_index; + Alternative column_name; + NameColumn() + : column_name("name_column"), + column_index("name_column_index", 0) + {} + }; + + struct Params : public LLInitParam::Block + { + Optional name_column; + Optional allow_calling_card_drop; + Optional short_names; + Params(); + }; protected: - LLNameListCtrl(const Params&); - virtual ~LLNameListCtrl() - { - for (avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.begin(); it != mAvatarNameCacheConnections.end(); ++it) - { - if (it->second.connected()) - { - it->second.disconnect(); - } - } - mAvatarNameCacheConnections.clear(); - } - friend class LLUICtrlFactory; + LLNameListCtrl(const Params&); + virtual ~LLNameListCtrl() + { + for (avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.begin(); it != mAvatarNameCacheConnections.end(); ++it) + { + if (it->second.connected()) + { + it->second.disconnect(); + } + } + mAvatarNameCacheConnections.clear(); + } + friend class LLUICtrlFactory; public: - // Add a user to the list by name. It will be added, the name - // requested from the cache, and updated as necessary. - LLScrollListItem* addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM, - BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null, const std::string& prefix = LLStringUtil::null); - LLScrollListItem* addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM); + // Add a user to the list by name. It will be added, the name + // requested from the cache, and updated as necessary. + LLScrollListItem* addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM, + BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null, const std::string& prefix = LLStringUtil::null); + LLScrollListItem* addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM); - /*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL); - LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM, const std::string& suffix = LLStringUtil::null, - const std::string& prefix = LLStringUtil::null); + /*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL); + LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM, const std::string& suffix = LLStringUtil::null, + const std::string& prefix = LLStringUtil::null); - // Add a user to the list by name. It will be added, the name - // requested from the cache, and updated as necessary. - void addGroupNameItem(const LLUUID& group_id, EAddPosition pos = ADD_BOTTOM, - BOOL enabled = TRUE); - void addGroupNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM); + // Add a user to the list by name. It will be added, the name + // requested from the cache, and updated as necessary. + void addGroupNameItem(const LLUUID& group_id, EAddPosition pos = ADD_BOTTOM, + BOOL enabled = TRUE); + void addGroupNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM); - void removeNameItem(const LLUUID& agent_id); + void removeNameItem(const LLUUID& agent_id); - LLScrollListItem* getNameItemByAgentId(const LLUUID& agent_id); + LLScrollListItem* getNameItemByAgentId(const LLUUID& agent_id); void selectItemBySpecialId(const LLUUID& special_id); LLUUID getSelectedSpecialId(); - // LLView interface - /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, - BOOL drop, EDragAndDropType cargo_type, void *cargo_data, - EAcceptance *accept, - std::string& tooltip_msg); - /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); + // LLView interface + /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, + BOOL drop, EDragAndDropType cargo_type, void *cargo_data, + EAcceptance *accept, + std::string& tooltip_msg); + /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); - void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; } + void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; } - void sortByName(BOOL ascending); + void sortByName(BOOL ascending); - /*virtual*/ void updateColumns(bool force_update); + /*virtual*/ void updateColumns(bool force_update); - /*virtual*/ void mouseOverHighlightNthItem( S32 index ); + /*virtual*/ void mouseOverHighlightNthItem( S32 index ); /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); @@ -188,36 +188,36 @@ public: void setHoverIconName(std::string icon_name) { mHoverIconName = icon_name; } private: - void showInspector(const LLUUID& avatar_id, bool is_group, bool is_experience = false); - void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, std::string prefix, LLHandle item); - void onGroupNameCache(const LLUUID& group_id, const std::string name, LLHandle item); + void showInspector(const LLUUID& avatar_id, bool is_group, bool is_experience = false); + void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, std::string prefix, LLHandle item); + void onGroupNameCache(const LLUUID& group_id, const std::string name, LLHandle item); private: - S32 mNameColumnIndex; - std::string mNameColumn; - BOOL mAllowCallingCardDrop; - bool mShortNames; // display name only, no SLID - typedef std::map avatar_name_cache_connection_map_t; - avatar_name_cache_connection_map_t mAvatarNameCacheConnections; - avatar_name_cache_connection_map_t mGroupNameCacheConnections; + S32 mNameColumnIndex; + std::string mNameColumn; + BOOL mAllowCallingCardDrop; + bool mShortNames; // display name only, no SLID + typedef std::map avatar_name_cache_connection_map_t; + avatar_name_cache_connection_map_t mAvatarNameCacheConnections; + avatar_name_cache_connection_map_t mGroupNameCacheConnections; - S32 mPendingLookupsRemaining; - namelist_complete_signal_t mNameListCompleteSignal; + S32 mPendingLookupsRemaining; + namelist_complete_signal_t mNameListCompleteSignal; std::string mHoverIconName; e_name_type mNameListType; boost::signals2::signal mIconClickedSignal; - + public: - boost::signals2::connection setOnNameListCompleteCallback(boost::function onNameListCompleteCallback) - { - return mNameListCompleteSignal.connect(onNameListCompleteCallback); - } - - boost::signals2::connection setIconClickedCallback(boost::function cb) - { - return mIconClickedSignal.connect(cb); + boost::signals2::connection setOnNameListCompleteCallback(boost::function onNameListCompleteCallback) + { + return mNameListCompleteSignal.connect(onNameListCompleteCallback); + } + + boost::signals2::connection setIconClickedCallback(boost::function cb) + { + return mIconClickedSignal.connect(cb); } }; -- cgit v1.2.3