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/llpanelgroup.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelgroup.h') diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h index be40b08a6d..28ba790a74 100644 --- a/indra/newview/llpanelgroup.h +++ b/indra/newview/llpanelgroup.h @@ -49,7 +49,7 @@ public: LLPanelGroup(); virtual ~LLPanelGroup(); - virtual BOOL postBuild(); + virtual bool postBuild(); void setGroupID(const LLUUID& group_id); @@ -77,7 +77,7 @@ public: void callGroup(); void chatGroup(); - virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + virtual void reshape(S32 width, S32 height, bool called_from_parent = true); static void showNotice(const std::string& subject, const std::string& message, @@ -148,7 +148,7 @@ public: virtual void update(LLGroupChange gc) { } // This just connects the help button callback. - virtual BOOL postBuild(); + virtual bool postBuild(); virtual BOOL isVisibleByAgent(LLAgent* agentp); -- 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/llpanelgroup.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpanelgroup.h') diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h index 28ba790a74..5aeadaefdb 100644 --- a/indra/newview/llpanelgroup.h +++ b/indra/newview/llpanelgroup.h @@ -107,7 +107,7 @@ protected: LLTimer mRefreshTimer; - BOOL mSkipRefresh; + bool mSkipRefresh; std::string mDefaultNeedsApplyMesg; std::string mWantApplyMesg; @@ -135,7 +135,7 @@ public: virtual bool needsApply(std::string& mesg) { return false; } // Asks if there is currently a modal dialog being shown. - virtual BOOL hasModal() { return mHasModal; } + virtual bool hasModal() { return mHasModal; } // Request to apply current data. // If returning fail, this function should modify the message to the user. @@ -150,7 +150,7 @@ public: // This just connects the help button callback. virtual bool postBuild(); - virtual BOOL isVisibleByAgent(LLAgent* agentp); + virtual bool isVisibleByAgent(LLAgent* agentp); virtual void setGroupID(const LLUUID& id) {mGroupID = id;}; @@ -164,8 +164,8 @@ public: protected: LLUUID mGroupID; - BOOL mAllowEdit; - BOOL mHasModal; + bool mAllowEdit; + bool mHasModal; }; #endif // LL_LLPANELGROUP_H -- 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/llpanelgroup.h | 342 +++++++++++++++++++++---------------------- 1 file changed, 171 insertions(+), 171 deletions(-) (limited to 'indra/newview/llpanelgroup.h') diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h index 3873228cbd..f85408698a 100644 --- a/indra/newview/llpanelgroup.h +++ b/indra/newview/llpanelgroup.h @@ -1,171 +1,171 @@ -/** - * @file llpanelgroup.h - * - * $LicenseInfo:firstyear=2006&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_LLPANELGROUP_H -#define LL_LLPANELGROUP_H - -#include "llgroupmgr.h" -#include "llpanel.h" -#include "lltimer.h" -#include "llvoiceclient.h" - -class LLOfferInfo; - -const F32 UPDATE_MEMBERS_SECONDS_PER_FRAME = 0.005; // 5ms - -// Forward declares -class LLPanelGroupTab; -class LLTabContainer; -class LLAgent; - - -class LLPanelGroup : public LLPanel, - public LLGroupMgrObserver, - public LLVoiceClientStatusObserver -{ -public: - LLPanelGroup(); - virtual ~LLPanelGroup(); - - virtual bool postBuild(); - - void setGroupID(const LLUUID& group_id); - - void draw(); - - void onOpen(const LLSD& key); - - // Group manager observer trigger. - virtual void changed(LLGroupChange gc); - - // Implements LLVoiceClientStatusObserver::onChange() to enable the call - // button when voice is available - /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal); - - void showNotice(const std::string& subject, - const std::string& message, - const bool& has_inventory, - const std::string& inventory_name, - LLOfferInfo* inventory_offer); - - void notifyObservers(); - - bool apply(); - void refreshData(); - void callGroup(); - void chatGroup(); - - virtual void reshape(S32 width, S32 height, bool called_from_parent = true); - - static void showNotice(const std::string& subject, - const std::string& message, - const LLUUID& group_id, - const bool& has_inventory, - const std::string& inventory_name, - LLOfferInfo* inventory_offer); - - -protected: - virtual void update(LLGroupChange gc); - - void onBackBtnClick(); - void onBtnJoin(); - - static void onBtnApply(void*); - static void onBtnRefresh(void*); - static void onBtnGroupCallClicked(void*); - static void onBtnGroupChatClicked(void*); - - void reposButton(const std::string& name); - void reposButtons(); - - -protected: - bool apply(LLPanelGroupTab* tab); - - LLTimer mRefreshTimer; - - bool mSkipRefresh; - - std::string mDefaultNeedsApplyMesg; - std::string mWantApplyMesg; - - std::vector mTabs; - - LLButton* mButtonJoin; - LLUICtrl* mJoinText; -}; - -class LLPanelGroupTab : public LLPanel -{ -public: - LLPanelGroupTab(); - virtual ~LLPanelGroupTab(); - - // Triggered when the tab becomes active. - virtual void activate() { } - - // Triggered when the tab becomes inactive. - virtual void deactivate() { } - - // Asks if something needs to be applied. - // If returning true, this function should modify the message to the user. - virtual bool needsApply(std::string& mesg) { return false; } - - // Asks if there is currently a modal dialog being shown. - virtual bool hasModal() { return mHasModal; } - - // Request to apply current data. - // If returning fail, this function should modify the message to the user. - virtual bool apply(std::string& mesg) { return true; } - - // Request a cancel of changes - virtual void cancel() { } - - // Triggered when group information changes in the group manager. - virtual void update(LLGroupChange gc) { } - - // This just connects the help button callback. - virtual bool postBuild(); - - virtual bool isVisibleByAgent(LLAgent* agentp); - - virtual void setGroupID(const LLUUID& id) {mGroupID = id;}; - - void notifyObservers() {}; - - const LLUUID& getGroupID() const { return mGroupID;} - - virtual void setupCtrls (LLPanel* parent) {}; - - virtual void onFilterChanged() { } - -protected: - LLUUID mGroupID; - bool mAllowEdit; - bool mHasModal; -}; - -#endif // LL_LLPANELGROUP_H +/** + * @file llpanelgroup.h + * + * $LicenseInfo:firstyear=2006&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_LLPANELGROUP_H +#define LL_LLPANELGROUP_H + +#include "llgroupmgr.h" +#include "llpanel.h" +#include "lltimer.h" +#include "llvoiceclient.h" + +class LLOfferInfo; + +const F32 UPDATE_MEMBERS_SECONDS_PER_FRAME = 0.005; // 5ms + +// Forward declares +class LLPanelGroupTab; +class LLTabContainer; +class LLAgent; + + +class LLPanelGroup : public LLPanel, + public LLGroupMgrObserver, + public LLVoiceClientStatusObserver +{ +public: + LLPanelGroup(); + virtual ~LLPanelGroup(); + + virtual bool postBuild(); + + void setGroupID(const LLUUID& group_id); + + void draw(); + + void onOpen(const LLSD& key); + + // Group manager observer trigger. + virtual void changed(LLGroupChange gc); + + // Implements LLVoiceClientStatusObserver::onChange() to enable the call + // button when voice is available + /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal); + + void showNotice(const std::string& subject, + const std::string& message, + const bool& has_inventory, + const std::string& inventory_name, + LLOfferInfo* inventory_offer); + + void notifyObservers(); + + bool apply(); + void refreshData(); + void callGroup(); + void chatGroup(); + + virtual void reshape(S32 width, S32 height, bool called_from_parent = true); + + static void showNotice(const std::string& subject, + const std::string& message, + const LLUUID& group_id, + const bool& has_inventory, + const std::string& inventory_name, + LLOfferInfo* inventory_offer); + + +protected: + virtual void update(LLGroupChange gc); + + void onBackBtnClick(); + void onBtnJoin(); + + static void onBtnApply(void*); + static void onBtnRefresh(void*); + static void onBtnGroupCallClicked(void*); + static void onBtnGroupChatClicked(void*); + + void reposButton(const std::string& name); + void reposButtons(); + + +protected: + bool apply(LLPanelGroupTab* tab); + + LLTimer mRefreshTimer; + + bool mSkipRefresh; + + std::string mDefaultNeedsApplyMesg; + std::string mWantApplyMesg; + + std::vector mTabs; + + LLButton* mButtonJoin; + LLUICtrl* mJoinText; +}; + +class LLPanelGroupTab : public LLPanel +{ +public: + LLPanelGroupTab(); + virtual ~LLPanelGroupTab(); + + // Triggered when the tab becomes active. + virtual void activate() { } + + // Triggered when the tab becomes inactive. + virtual void deactivate() { } + + // Asks if something needs to be applied. + // If returning true, this function should modify the message to the user. + virtual bool needsApply(std::string& mesg) { return false; } + + // Asks if there is currently a modal dialog being shown. + virtual bool hasModal() { return mHasModal; } + + // Request to apply current data. + // If returning fail, this function should modify the message to the user. + virtual bool apply(std::string& mesg) { return true; } + + // Request a cancel of changes + virtual void cancel() { } + + // Triggered when group information changes in the group manager. + virtual void update(LLGroupChange gc) { } + + // This just connects the help button callback. + virtual bool postBuild(); + + virtual bool isVisibleByAgent(LLAgent* agentp); + + virtual void setGroupID(const LLUUID& id) {mGroupID = id;}; + + void notifyObservers() {}; + + const LLUUID& getGroupID() const { return mGroupID;} + + virtual void setupCtrls (LLPanel* parent) {}; + + virtual void onFilterChanged() { } + +protected: + LLUUID mGroupID; + bool mAllowEdit; + bool mHasModal; +}; + +#endif // LL_LLPANELGROUP_H -- cgit v1.2.3