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/llfloateravatarpicker.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloateravatarpicker.h') diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h index fbee61b054..6a4e0a75d6 100644 --- a/indra/newview/llfloateravatarpicker.h +++ b/indra/newview/llfloateravatarpicker.h @@ -55,15 +55,15 @@ public: LLFloaterAvatarPicker(const LLSD& key); virtual ~LLFloaterAvatarPicker(); - virtual BOOL postBuild(); + virtual bool postBuild(); void setOkBtnEnableCb(validate_callback_t cb); static void processAvatarPickerReply(class LLMessageSystem* msg, void**); void processResponse(const LLUUID& query_id, const LLSD& content); - BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, - BOOL drop, EDragAndDropType cargo_type, + bool handleDragAndDrop(S32 x, S32 y, MASK mask, + bool drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg); @@ -93,7 +93,7 @@ private: void drawFrustum(); virtual void draw(); - virtual BOOL handleKeyHere(KEY key, MASK mask); + virtual bool handleKeyHere(KEY key, MASK mask); LLUUID mQueryID; int mNumResultsReturned; -- 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/llfloateravatarpicker.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/llfloateravatarpicker.h') diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h index 6a4e0a75d6..4a65481e5f 100644 --- a/indra/newview/llfloateravatarpicker.h +++ b/indra/newview/llfloateravatarpicker.h @@ -46,9 +46,9 @@ public: typedef boost::function&)> select_callback_t; // Call this to select an avatar. static LLFloaterAvatarPicker* show(select_callback_t callback, - BOOL allow_multiple = FALSE, - BOOL closeOnSelect = FALSE, - BOOL skip_agent = FALSE, + bool allow_multiple = false, + bool closeOnSelect = false, + bool skip_agent = false, const std::string& name = "", LLView * frustumOrigin = NULL); @@ -68,7 +68,7 @@ public: std::string& tooltip_msg); void openFriendsTab(); - BOOL isExcludeAgentFromSearchResults() {return mExcludeAgentFromSearchResults;} + bool isExcludeAgentFromSearchResults() {return mExcludeAgentFromSearchResults;} private: void editKeystroke(class LLLineEditor* caller, void* user_data); @@ -84,11 +84,11 @@ private: void populateNearMe(); void populateFriend(); - BOOL visibleItemsSelected() const; // Returns true if any items in the current tab are selected. + bool visibleItemsSelected() const; // Returns true if any items in the current tab are selected. static void findCoro(std::string url, LLUUID mQueryID, std::string mName); void find(); - void setAllowMultiple(BOOL allow_multiple); + void setAllowMultiple(bool allow_multiple); LLScrollListCtrl* getActiveList(); void drawFrustum(); @@ -97,9 +97,9 @@ private: LLUUID mQueryID; int mNumResultsReturned; - BOOL mNearMeListComplete; - BOOL mCloseOnSelect; - BOOL mExcludeAgentFromSearchResults; + bool mNearMeListComplete; + bool mCloseOnSelect; + bool mExcludeAgentFromSearchResults; LLHandle mFrustumOrigin; F32 mContextConeOpacity; F32 mContextConeInAlpha; -- 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/llfloateravatarpicker.h | 226 +++++++++++++++++----------------- 1 file changed, 113 insertions(+), 113 deletions(-) (limited to 'indra/newview/llfloateravatarpicker.h') diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h index 7d72076ae2..330f1a1226 100644 --- a/indra/newview/llfloateravatarpicker.h +++ b/indra/newview/llfloateravatarpicker.h @@ -1,113 +1,113 @@ -/** - * @file llfloateravatarpicker.h - * @brief was llavatarpicker.h - * - * $LicenseInfo:firstyear=2003&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 LLFLOATERAVATARPICKER_H -#define LLFLOATERAVATARPICKER_H - -#include "llfloater.h" -#include "lleventcoro.h" -#include "llcoros.h" - -#include - -class LLAvatarName; -class LLScrollListCtrl; - -class LLFloaterAvatarPicker :public LLFloater -{ -public: - typedef boost::signals2::signal validate_signal_t; - typedef validate_signal_t::slot_type validate_callback_t; - - // The callback function will be called with an avatar name and UUID. - typedef boost::function&)> select_callback_t; - // Call this to select an avatar. - static LLFloaterAvatarPicker* show(select_callback_t callback, - bool allow_multiple = false, - bool closeOnSelect = false, - bool skip_agent = false, - const std::string& name = "", - LLView * frustumOrigin = NULL); - - LLFloaterAvatarPicker(const LLSD& key); - virtual ~LLFloaterAvatarPicker(); - - virtual bool postBuild(); - - void setOkBtnEnableCb(validate_callback_t cb); - - static void processAvatarPickerReply(class LLMessageSystem* msg, void**); - void processResponse(const LLUUID& query_id, const LLSD& content); - - bool handleDragAndDrop(S32 x, S32 y, MASK mask, - bool drop, EDragAndDropType cargo_type, - void *cargo_data, EAcceptance *accept, - std::string& tooltip_msg); - - void openFriendsTab(); - bool isExcludeAgentFromSearchResults() {return mExcludeAgentFromSearchResults;} - -private: - void editKeystroke(class LLLineEditor* caller, void* user_data); - - void onBtnFind(); - void onBtnSelect(); - void onBtnRefresh(); - void onRangeAdjust(); - void onBtnClose(); - void onList(); - void onTabChanged(); - bool isSelectBtnEnabled(); - - void populateNearMe(); - void populateFriend(); - bool visibleItemsSelected() const; // Returns true if any items in the current tab are selected. - - static void findCoro(std::string url, LLUUID mQueryID, std::string mName); - void find(); - void setAllowMultiple(bool allow_multiple); - LLScrollListCtrl* getActiveList(); - - void drawFrustum(); - virtual void draw(); - virtual bool handleKeyHere(KEY key, MASK mask); - - LLUUID mQueryID; - int mNumResultsReturned; - bool mNearMeListComplete; - bool mCloseOnSelect; - bool mExcludeAgentFromSearchResults; - LLHandle mFrustumOrigin; - F32 mContextConeOpacity; - F32 mContextConeInAlpha; - F32 mContextConeOutAlpha; - F32 mContextConeFadeTime; - - validate_signal_t mOkButtonValidateSignal; - select_callback_t mSelectionCallback; -}; - -#endif +/** + * @file llfloateravatarpicker.h + * @brief was llavatarpicker.h + * + * $LicenseInfo:firstyear=2003&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 LLFLOATERAVATARPICKER_H +#define LLFLOATERAVATARPICKER_H + +#include "llfloater.h" +#include "lleventcoro.h" +#include "llcoros.h" + +#include + +class LLAvatarName; +class LLScrollListCtrl; + +class LLFloaterAvatarPicker :public LLFloater +{ +public: + typedef boost::signals2::signal validate_signal_t; + typedef validate_signal_t::slot_type validate_callback_t; + + // The callback function will be called with an avatar name and UUID. + typedef boost::function&)> select_callback_t; + // Call this to select an avatar. + static LLFloaterAvatarPicker* show(select_callback_t callback, + bool allow_multiple = false, + bool closeOnSelect = false, + bool skip_agent = false, + const std::string& name = "", + LLView * frustumOrigin = NULL); + + LLFloaterAvatarPicker(const LLSD& key); + virtual ~LLFloaterAvatarPicker(); + + virtual bool postBuild(); + + void setOkBtnEnableCb(validate_callback_t cb); + + static void processAvatarPickerReply(class LLMessageSystem* msg, void**); + void processResponse(const LLUUID& query_id, const LLSD& content); + + bool handleDragAndDrop(S32 x, S32 y, MASK mask, + bool drop, EDragAndDropType cargo_type, + void *cargo_data, EAcceptance *accept, + std::string& tooltip_msg); + + void openFriendsTab(); + bool isExcludeAgentFromSearchResults() {return mExcludeAgentFromSearchResults;} + +private: + void editKeystroke(class LLLineEditor* caller, void* user_data); + + void onBtnFind(); + void onBtnSelect(); + void onBtnRefresh(); + void onRangeAdjust(); + void onBtnClose(); + void onList(); + void onTabChanged(); + bool isSelectBtnEnabled(); + + void populateNearMe(); + void populateFriend(); + bool visibleItemsSelected() const; // Returns true if any items in the current tab are selected. + + static void findCoro(std::string url, LLUUID mQueryID, std::string mName); + void find(); + void setAllowMultiple(bool allow_multiple); + LLScrollListCtrl* getActiveList(); + + void drawFrustum(); + virtual void draw(); + virtual bool handleKeyHere(KEY key, MASK mask); + + LLUUID mQueryID; + int mNumResultsReturned; + bool mNearMeListComplete; + bool mCloseOnSelect; + bool mExcludeAgentFromSearchResults; + LLHandle mFrustumOrigin; + F32 mContextConeOpacity; + F32 mContextConeInAlpha; + F32 mContextConeOutAlpha; + F32 mContextConeFadeTime; + + validate_signal_t mOkButtonValidateSignal; + select_callback_t mSelectionCallback; +}; + +#endif -- cgit v1.2.3