From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 18 Feb 2024 12:52:19 +0100 Subject: Replace BOOL with bool in llwindow and dependent classes --- indra/newview/llgrouplist.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llgrouplist.h') diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index 5cbabb712f..110e221832 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -60,8 +60,8 @@ public: void enableForAgent(bool show_icons); virtual void draw(); // from LLView - /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); // from LLView - /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); // from LLView + /*virtual*/ bool handleRightMouseDown(S32 x, S32 y, MASK mask); // from LLView + /*virtual*/ bool handleDoubleClick(S32 x, S32 y, MASK mask); // from LLView void setNameFilter(const std::string& filter); void toggleIcons(); -- cgit v1.2.3 From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llgrouplist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llgrouplist.h') diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index 110e221832..6af073e364 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -103,7 +103,7 @@ class LLGroupListItem : public LLPanel public: LLGroupListItem(bool for_agent, bool show_icons); ~LLGroupListItem(); - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); /*virtual*/ void setValue(const LLSD& value); void onMouseEnter(S32 x, S32 y, MASK mask); void onMouseLeave(S32 x, S32 y, MASK mask); -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llgrouplist.h | 288 ++++++++++++++++++++++---------------------- 1 file changed, 144 insertions(+), 144 deletions(-) (limited to 'indra/newview/llgrouplist.h') diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index 530281cf18..19d4e82a93 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -1,144 +1,144 @@ -/** - * @file llgrouplist.h - * @brief List of the groups the agent belongs to. - * - * $LicenseInfo:firstyear=2009&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLGROUPLIST_H -#define LL_LLGROUPLIST_H - -#include "llevent.h" -#include "llpointer.h" - -#include "llflatlistview.h" -#include "llpanel.h" -#include "llstyle.h" -#include "lltoggleablemenu.h" - -#include "llgroupmgr.h" - -/** - * Auto-updating list of agent groups. - * - * Can use optional group name filter. - * - * @see setNameFilter() - */ -class LLGroupList: public LLFlatListViewEx, public LLOldEvents::LLSimpleListener -{ - LOG_CLASS(LLGroupList); -public: - struct Params : public LLInitParam::Block - { - Optional for_agent; - Params(); - }; - - LLGroupList(const Params& p); - virtual ~LLGroupList(); - - void enableForAgent(bool show_icons); - - virtual void draw(); // from LLView - /*virtual*/ bool handleRightMouseDown(S32 x, S32 y, MASK mask); // from LLView - /*virtual*/ bool handleDoubleClick(S32 x, S32 y, MASK mask); // from LLView - - void setNameFilter(const std::string& filter); - void toggleIcons(); - bool getIconsVisible() const { return mShowIcons; } - void setIconsVisible(bool show_icons) { mShowIcons = show_icons; } - void setShowNone(bool show_none) { mShowNone = show_none; } - void setGroups(const std::map< std::string,LLUUID> group_list); - - LLToggleableMenu* getContextMenu() const { return mContextMenuHandle.get(); } - -private: - void setDirty(bool val = true) { mDirty = val; } - void refresh(); - void addNewItem(const LLUUID& id, const std::string& name, const LLUUID& icon_id, EAddPosition pos = ADD_BOTTOM, bool visible_in_profile = true); - bool handleEvent(LLPointer event, const LLSD& userdata); // called on agent group list changes - - bool onContextMenuItemClick(const LLSD& userdata); - bool onContextMenuItemEnable(const LLSD& userdata); - - LLHandle mContextMenuHandle; - - bool mShowIcons; - bool mDirty; - std::string mNameFilter; - - bool mForAgent; - bool mShowNone; - typedef std::map< std::string,LLUUID> group_map_t; - group_map_t mGroups; -}; - -class LLButton; -class LLGroupIconCtrl; -class LLTextBox; - -class LLGroupListItem : public LLPanel - , public LLGroupMgrObserver -{ -public: - LLGroupListItem(bool for_agent, bool show_icons); - ~LLGroupListItem(); - /*virtual*/ bool postBuild(); - /*virtual*/ void setValue(const LLSD& value); - void onMouseEnter(S32 x, S32 y, MASK mask); - void onMouseLeave(S32 x, S32 y, MASK mask); - - const LLUUID& getGroupID() const { return mGroupID; } - const std::string& getGroupName() const { return mGroupName; } - - void setName(const std::string& name, const std::string& highlight = LLStringUtil::null); - void setGroupID(const LLUUID& group_id); - void setGroupIconID(const LLUUID& group_icon_id); - void setGroupIconVisible(bool visible); - - virtual void changed(LLGroupChange gc); - - void setVisibleInProfile(bool visible); -private: - void setBold(bool bold); - void onInfoBtnClick(); - void onProfileBtnClick(); - void onNoticesBtnClick(); - void onVisibilityBtnClick(bool new_visibility); - - LLTextBox* mGroupNameBox; - LLUUID mGroupID; - LLGroupIconCtrl* mGroupIcon; - LLButton* mInfoBtn; - LLButton* mProfileBtn; - LLButton* mNoticesBtn; - LLButton* mVisibilityHideBtn; - LLButton* mVisibilityShowBtn; - - std::string mGroupName; - bool mForAgent; - LLStyle::Params mGroupNameStyle; - - S32 mIconWidth; -}; -#endif // LL_LLGROUPLIST_H +/** + * @file llgrouplist.h + * @brief List of the groups the agent belongs to. + * + * $LicenseInfo:firstyear=2009&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLGROUPLIST_H +#define LL_LLGROUPLIST_H + +#include "llevent.h" +#include "llpointer.h" + +#include "llflatlistview.h" +#include "llpanel.h" +#include "llstyle.h" +#include "lltoggleablemenu.h" + +#include "llgroupmgr.h" + +/** + * Auto-updating list of agent groups. + * + * Can use optional group name filter. + * + * @see setNameFilter() + */ +class LLGroupList: public LLFlatListViewEx, public LLOldEvents::LLSimpleListener +{ + LOG_CLASS(LLGroupList); +public: + struct Params : public LLInitParam::Block + { + Optional for_agent; + Params(); + }; + + LLGroupList(const Params& p); + virtual ~LLGroupList(); + + void enableForAgent(bool show_icons); + + virtual void draw(); // from LLView + /*virtual*/ bool handleRightMouseDown(S32 x, S32 y, MASK mask); // from LLView + /*virtual*/ bool handleDoubleClick(S32 x, S32 y, MASK mask); // from LLView + + void setNameFilter(const std::string& filter); + void toggleIcons(); + bool getIconsVisible() const { return mShowIcons; } + void setIconsVisible(bool show_icons) { mShowIcons = show_icons; } + void setShowNone(bool show_none) { mShowNone = show_none; } + void setGroups(const std::map< std::string,LLUUID> group_list); + + LLToggleableMenu* getContextMenu() const { return mContextMenuHandle.get(); } + +private: + void setDirty(bool val = true) { mDirty = val; } + void refresh(); + void addNewItem(const LLUUID& id, const std::string& name, const LLUUID& icon_id, EAddPosition pos = ADD_BOTTOM, bool visible_in_profile = true); + bool handleEvent(LLPointer event, const LLSD& userdata); // called on agent group list changes + + bool onContextMenuItemClick(const LLSD& userdata); + bool onContextMenuItemEnable(const LLSD& userdata); + + LLHandle mContextMenuHandle; + + bool mShowIcons; + bool mDirty; + std::string mNameFilter; + + bool mForAgent; + bool mShowNone; + typedef std::map< std::string,LLUUID> group_map_t; + group_map_t mGroups; +}; + +class LLButton; +class LLGroupIconCtrl; +class LLTextBox; + +class LLGroupListItem : public LLPanel + , public LLGroupMgrObserver +{ +public: + LLGroupListItem(bool for_agent, bool show_icons); + ~LLGroupListItem(); + /*virtual*/ bool postBuild(); + /*virtual*/ void setValue(const LLSD& value); + void onMouseEnter(S32 x, S32 y, MASK mask); + void onMouseLeave(S32 x, S32 y, MASK mask); + + const LLUUID& getGroupID() const { return mGroupID; } + const std::string& getGroupName() const { return mGroupName; } + + void setName(const std::string& name, const std::string& highlight = LLStringUtil::null); + void setGroupID(const LLUUID& group_id); + void setGroupIconID(const LLUUID& group_icon_id); + void setGroupIconVisible(bool visible); + + virtual void changed(LLGroupChange gc); + + void setVisibleInProfile(bool visible); +private: + void setBold(bool bold); + void onInfoBtnClick(); + void onProfileBtnClick(); + void onNoticesBtnClick(); + void onVisibilityBtnClick(bool new_visibility); + + LLTextBox* mGroupNameBox; + LLUUID mGroupID; + LLGroupIconCtrl* mGroupIcon; + LLButton* mInfoBtn; + LLButton* mProfileBtn; + LLButton* mNoticesBtn; + LLButton* mVisibilityHideBtn; + LLButton* mVisibilityShowBtn; + + std::string mGroupName; + bool mForAgent; + LLStyle::Params mGroupNameStyle; + + S32 mIconWidth; +}; +#endif // LL_LLGROUPLIST_H -- cgit v1.2.3