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/llpanelblockedlist.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpanelblockedlist.h') diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h index 07f0437656..e2c7ef819d 100644 --- a/indra/newview/llpanelblockedlist.h +++ b/indra/newview/llpanelblockedlist.h @@ -40,9 +40,9 @@ public: LLPanelBlockedList(); ~LLPanelBlockedList(){}; - virtual BOOL postBuild(); - virtual void draw(); - virtual void onOpen(const LLSD& key); + bool postBuild() override; + void draw() override; + void onOpen(const LLSD& key) override; void selectBlocked(const LLUUID& id); @@ -92,9 +92,9 @@ class LLFloaterGetBlockedObjectName : public LLFloater public: typedef boost::function get_object_name_callback_t; - virtual BOOL postBuild(); + bool postBuild() override; - virtual BOOL handleKeyHere(KEY key, MASK mask); + bool handleKeyHere(KEY key, MASK mask) override; static LLFloaterGetBlockedObjectName* show(get_object_name_callback_t callback); -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/llpanelblockedlist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelblockedlist.h') diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h index e2c7ef819d..f5790e08f9 100644 --- a/indra/newview/llpanelblockedlist.h +++ b/indra/newview/llpanelblockedlist.h @@ -72,7 +72,7 @@ private: // List commnads void onCustomAction(const LLSD& userdata); - BOOL isActionChecked(const LLSD& userdata); + bool isActionChecked(const LLSD& userdata); void callbackBlockPicked(const uuid_vec_t& ids, const std::vector names); static void callbackBlockByName(const std::string& text); -- 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/llpanelblockedlist.h | 226 ++++++++++++++++++------------------- 1 file changed, 113 insertions(+), 113 deletions(-) (limited to 'indra/newview/llpanelblockedlist.h') diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h index d9d5064086..446f3d4bad 100644 --- a/indra/newview/llpanelblockedlist.h +++ b/indra/newview/llpanelblockedlist.h @@ -1,113 +1,113 @@ -/** - * @file llpanelblockedlist.h - * @brief Container for blocked Residents & Objects list - * - * $LicenseInfo:firstyear=2002&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_LLPANELBLOCKEDLIST_H -#define LL_LLPANELBLOCKEDLIST_H - -#include "llpanel.h" -#include "llmutelist.h" -#include "llfloater.h" - -class LLAvatarName; -class LLBlockList; - -class LLPanelBlockedList : public LLPanel -{ -public: - LLPanelBlockedList(); - ~LLPanelBlockedList(){}; - - bool postBuild() override; - void draw() override; - void onOpen(const LLSD& key) override; - - void selectBlocked(const LLUUID& id); - - /** - * Shows current Panel in side tray and select passed blocked item. - * - * @param idToSelect - LLUUID of blocked Resident or Object to be selected. - * If it is LLUUID::null, nothing will be selected. - */ - static void showPanelAndSelect(const LLUUID& idToSelect); - -private: - - typedef enum e_sort_oder{ - E_SORT_BY_NAME = 0, - E_SORT_BY_TYPE = 1, - } ESortOrder; - - void removePicker(); - void updateButtons(); - - // UI callbacks - void unblockItem(); - void blockResidentByName(); - void blockObjectByName(); - void onFilterEdit(const std::string& search_string); - - // List commnads - void onCustomAction(const LLSD& userdata); - bool isActionChecked(const LLSD& userdata); - - void callbackBlockPicked(const uuid_vec_t& ids, const std::vector names); - static void callbackBlockByName(const std::string& text); - -private: - LLBlockList* mBlockedList; - LLHandle mPicker; -}; - -//----------------------------------------------------------------------------- -// LLFloaterGetBlockedObjectName() -//----------------------------------------------------------------------------- -// Class for handling mute object by name floater. -class LLFloaterGetBlockedObjectName : public LLFloater -{ - friend class LLFloaterReg; -public: - typedef boost::function get_object_name_callback_t; - - bool postBuild() override; - - bool handleKeyHere(KEY key, MASK mask) override; - - static LLFloaterGetBlockedObjectName* show(get_object_name_callback_t callback); - -private: - LLFloaterGetBlockedObjectName(const LLSD& key); - virtual ~LLFloaterGetBlockedObjectName(); - - // UI Callbacks - void applyBlocking(); - void cancelBlocking(); - - get_object_name_callback_t mGetObjectNameCallback; -}; - - -#endif // LL_LLPANELBLOCKEDLIST_H +/** + * @file llpanelblockedlist.h + * @brief Container for blocked Residents & Objects list + * + * $LicenseInfo:firstyear=2002&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_LLPANELBLOCKEDLIST_H +#define LL_LLPANELBLOCKEDLIST_H + +#include "llpanel.h" +#include "llmutelist.h" +#include "llfloater.h" + +class LLAvatarName; +class LLBlockList; + +class LLPanelBlockedList : public LLPanel +{ +public: + LLPanelBlockedList(); + ~LLPanelBlockedList(){}; + + bool postBuild() override; + void draw() override; + void onOpen(const LLSD& key) override; + + void selectBlocked(const LLUUID& id); + + /** + * Shows current Panel in side tray and select passed blocked item. + * + * @param idToSelect - LLUUID of blocked Resident or Object to be selected. + * If it is LLUUID::null, nothing will be selected. + */ + static void showPanelAndSelect(const LLUUID& idToSelect); + +private: + + typedef enum e_sort_oder{ + E_SORT_BY_NAME = 0, + E_SORT_BY_TYPE = 1, + } ESortOrder; + + void removePicker(); + void updateButtons(); + + // UI callbacks + void unblockItem(); + void blockResidentByName(); + void blockObjectByName(); + void onFilterEdit(const std::string& search_string); + + // List commnads + void onCustomAction(const LLSD& userdata); + bool isActionChecked(const LLSD& userdata); + + void callbackBlockPicked(const uuid_vec_t& ids, const std::vector names); + static void callbackBlockByName(const std::string& text); + +private: + LLBlockList* mBlockedList; + LLHandle mPicker; +}; + +//----------------------------------------------------------------------------- +// LLFloaterGetBlockedObjectName() +//----------------------------------------------------------------------------- +// Class for handling mute object by name floater. +class LLFloaterGetBlockedObjectName : public LLFloater +{ + friend class LLFloaterReg; +public: + typedef boost::function get_object_name_callback_t; + + bool postBuild() override; + + bool handleKeyHere(KEY key, MASK mask) override; + + static LLFloaterGetBlockedObjectName* show(get_object_name_callback_t callback); + +private: + LLFloaterGetBlockedObjectName(const LLSD& key); + virtual ~LLFloaterGetBlockedObjectName(); + + // UI Callbacks + void applyBlocking(); + void cancelBlocking(); + + get_object_name_callback_t mGetObjectNameCallback; +}; + + +#endif // LL_LLPANELBLOCKEDLIST_H -- cgit v1.2.3