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/llfloaterregioninfo.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 3eb39b250f..601f3e7455 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -77,7 +77,7 @@ public: /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void onClose(bool app_quitting); - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); static void processEstateOwnerRequest(LLMessageSystem* msg, void**); @@ -144,7 +144,7 @@ public: virtual bool refreshFromRegion(LLViewerRegion* region); virtual bool estateUpdate(LLMessageSystem* msg) { return true; } - virtual BOOL postBuild(); + virtual bool postBuild(); virtual void updateChild(LLUICtrl* child_ctrl); void enableButton(const std::string& btn_name, BOOL enable = TRUE); @@ -187,7 +187,7 @@ public: virtual bool refreshFromRegion(LLViewerRegion* region); // LLPanel - virtual BOOL postBuild(); + virtual bool postBuild(); void onBtnSet(); void setObjBonusFactor(F32 object_bonus_factor) {mObjBonusFactor = object_bonus_factor;} @@ -215,7 +215,7 @@ public: : LLPanelRegionInfo(), mTargetAvatar() {} ~LLPanelRegionDebugInfo() {} // LLPanel - virtual BOOL postBuild(); + virtual bool postBuild(); virtual bool refreshFromRegion(LLViewerRegion* region); @@ -247,7 +247,7 @@ public: LLPanelRegionTerrainInfo() : LLPanelRegionInfo() {} ~LLPanelRegionTerrainInfo() {} - virtual BOOL postBuild(); // LLPanel + virtual bool postBuild(); // LLPanel virtual bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator void setEnvControls(bool available); // Whether environment settings are available for this region @@ -307,7 +307,7 @@ public: virtual bool estateUpdate(LLMessageSystem* msg); // LLPanel - virtual BOOL postBuild(); + virtual bool postBuild(); virtual void updateChild(LLUICtrl* child_ctrl); virtual void refresh(); @@ -340,14 +340,14 @@ public: ~LLPanelEstateCovenant() {} // LLPanel - virtual BOOL postBuild(); + virtual bool postBuild(); virtual void updateChild(LLUICtrl* child_ctrl); virtual bool refreshFromRegion(LLViewerRegion* region); virtual bool estateUpdate(LLMessageSystem* msg); // LLView overrides - 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); static bool confirmChangeCovenantCallback(const LLSD& notification, const LLSD& response); @@ -401,7 +401,7 @@ class LLPanelRegionExperiences : public LLPanelRegionInfo public: LLPanelRegionExperiences(){} - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); virtual BOOL sendUpdate(); static bool experienceCoreConfirm(const LLSD& notification, const LLSD& response); @@ -435,7 +435,7 @@ class LLPanelEstateAccess : public LLPanelRegionInfo public: LLPanelEstateAccess(); - virtual BOOL postBuild(); + virtual bool postBuild(); virtual void updateChild(LLUICtrl* child_ctrl); void updateControls(LLViewerRegion* region); -- 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/llfloaterregioninfo.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 601f3e7455..b2e66eb065 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -147,7 +147,7 @@ public: virtual bool postBuild(); virtual void updateChild(LLUICtrl* child_ctrl); - void enableButton(const std::string& btn_name, BOOL enable = TRUE); + void enableButton(const std::string& btn_name, bool enable = true); void disableButton(const std::string& btn_name); void onClickManageTelehub(); @@ -155,9 +155,9 @@ public: protected: void initCtrl(const std::string& name); - // Returns TRUE if update sent and apply button should be + // Returns true if update sent and apply button should be // disabled. - virtual BOOL sendUpdate() { return TRUE; } + virtual bool sendUpdate() { return true; } typedef std::vector strings_t; //typedef std::vector integers_t; @@ -193,7 +193,7 @@ public: void setObjBonusFactor(F32 object_bonus_factor) {mObjBonusFactor = object_bonus_factor;} protected: - virtual BOOL sendUpdate(); + virtual bool sendUpdate(); void onClickKick(); void onKickCommit(const uuid_vec_t& ids); static void onClickKickAll(void* userdata); @@ -220,7 +220,7 @@ public: virtual bool refreshFromRegion(LLViewerRegion* region); protected: - virtual BOOL sendUpdate(); + virtual bool sendUpdate(); void onClickChooseAvatar(); void callbackAvatarID(const uuid_vec_t& ids, const std::vector names); @@ -252,12 +252,12 @@ public: virtual bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator void setEnvControls(bool available); // Whether environment settings are available for this region - BOOL validateTextureSizes(); - BOOL validateTextureHeights(); + bool validateTextureSizes(); + bool validateTextureHeights(); //static void onChangeAnything(LLUICtrl* ctrl, void* userData); // callback for any change, to enable commit button - virtual BOOL sendUpdate(); + virtual bool sendUpdate(); static void onClickDownloadRaw(void*); static void onClickUploadRaw(void*); @@ -319,14 +319,14 @@ public: void setOwnerName(const std::string& name); protected: - virtual BOOL sendUpdate(); + virtual bool sendUpdate(); // confirmation dialog callback bool callbackChangeLindenEstate(const LLSD& notification, const LLSD& response); void commitEstateAccess(); void commitEstateManagers(); - BOOL checkSunHourSlider(LLUICtrl* child_ctrl); + bool checkSunHourSlider(LLUICtrl* child_ctrl); U32 mEstateID; }; @@ -382,7 +382,7 @@ public: } EAssetStatus; protected: - virtual BOOL sendUpdate(); + virtual bool sendUpdate(); LLTextBox* mEstateNameText; LLTextBox* mEstateOwnerText; LLTextBox* mLastModifiedText; @@ -402,7 +402,7 @@ class LLPanelRegionExperiences : public LLPanelRegionInfo public: LLPanelRegionExperiences(){} /*virtual*/ bool postBuild(); - virtual BOOL sendUpdate(); + virtual bool sendUpdate(); static bool experienceCoreConfirm(const LLSD& notification, const LLSD& response); static void sendEstateExperienceDelta(U32 flags, const LLUUID& agent_id); @@ -486,7 +486,7 @@ private: void copyListToClipboard(std::string list_name); bool mPendingUpdate; - BOOL mCtrlsEnabled; + bool mCtrlsEnabled; }; #endif -- cgit v1.2.3