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/llpanelgroupcreate.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'indra/newview/llpanelgroupcreate.cpp') diff --git a/indra/newview/llpanelgroupcreate.cpp b/indra/newview/llpanelgroupcreate.cpp index 01a4ab0455..dcdc5821ef 100644 --- a/indra/newview/llpanelgroupcreate.cpp +++ b/indra/newview/llpanelgroupcreate.cpp @@ -66,28 +66,28 @@ LLPanelGroupCreate::~LLPanelGroupCreate() { } -BOOL LLPanelGroupCreate::postBuild() +bool LLPanelGroupCreate::postBuild() { childSetCommitCallback("back", boost::bind(&LLPanelGroupCreate::onBackBtnClick, this), NULL); - mComboMature = getChild("group_mature_check", TRUE); - mCtrlOpenEnrollment = getChild("open_enrollement", TRUE); - mCtrlEnrollmentFee = getChild("check_enrollment_fee", TRUE); - mEditCharter = getChild("charter", TRUE); - mSpinEnrollmentFee = getChild("spin_enrollment_fee", TRUE); - mMembershipList = getChild("membership_list", TRUE); + mComboMature = getChild("group_mature_check", true); + mCtrlOpenEnrollment = getChild("open_enrollement", true); + mCtrlEnrollmentFee = getChild("check_enrollment_fee", true); + mEditCharter = getChild("charter", true); + mSpinEnrollmentFee = getChild("spin_enrollment_fee", true); + mMembershipList = getChild("membership_list", true); - mCreateButton = getChild("btn_create", TRUE); + mCreateButton = getChild("btn_create", true); mCreateButton->setCommitCallback(boost::bind(&LLPanelGroupCreate::onBtnCreate, this)); - mGroupNameEditor = getChild("group_name_editor", TRUE); + mGroupNameEditor = getChild("group_name_editor", true); mGroupNameEditor->setPrevalidate(LLTextValidate::validateASCIINoLeadingSpace); - mInsignia = getChild("insignia", TRUE); + mInsignia = getChild("insignia", true); mInsignia->setAllowLocalTexture(FALSE); mInsignia->setCanApplyImmediately(FALSE); - return TRUE; + return true; } void LLPanelGroupCreate::onOpen(const LLSD& key) @@ -97,8 +97,8 @@ void LLPanelGroupCreate::onOpen(const LLSD& key) mGroupNameEditor->clear(); mEditCharter->clear(); mSpinEnrollmentFee->set(0.f); - mCtrlEnrollmentFee->set(FALSE); - mCtrlOpenEnrollment->set(FALSE); + mCtrlEnrollmentFee->set(false); + mCtrlOpenEnrollment->set(false); mMembershipList->clearRows(); // populate list -- 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/llpanelgroupcreate.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelgroupcreate.cpp') diff --git a/indra/newview/llpanelgroupcreate.cpp b/indra/newview/llpanelgroupcreate.cpp index dcdc5821ef..fd960c9e97 100644 --- a/indra/newview/llpanelgroupcreate.cpp +++ b/indra/newview/llpanelgroupcreate.cpp @@ -84,8 +84,8 @@ bool LLPanelGroupCreate::postBuild() mGroupNameEditor->setPrevalidate(LLTextValidate::validateASCIINoLeadingSpace); mInsignia = getChild("insignia", true); - mInsignia->setAllowLocalTexture(FALSE); - mInsignia->setCanApplyImmediately(FALSE); + mInsignia->setAllowLocalTexture(false); + mInsignia->setCanApplyImmediately(false); return true; } -- cgit v1.2.3 From b42f9d836b4c0f7fbd4bdae1734021e2a09fdbe8 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 1 Jun 2024 15:49:26 +0200 Subject: Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings --- indra/newview/llpanelgroupcreate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelgroupcreate.cpp') diff --git a/indra/newview/llpanelgroupcreate.cpp b/indra/newview/llpanelgroupcreate.cpp index fd960c9e97..833de9b5e4 100644 --- a/indra/newview/llpanelgroupcreate.cpp +++ b/indra/newview/llpanelgroupcreate.cpp @@ -194,7 +194,7 @@ void LLPanelGroupCreate::onBtnCreate() // Validate the group name length. std::string gr_name = mGroupNameEditor->getText(); LLStringUtil::trim(gr_name); - S32 group_name_len = gr_name.size(); + S32 group_name_len = static_cast(gr_name.size()); if (group_name_len < DB_GROUP_NAME_MIN_LEN || group_name_len > DB_GROUP_NAME_STR_LEN) { -- cgit v1.2.3 From c95b4bf3ea2b681d6d05468b07e60fedb71fa2cf Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 10 Jun 2024 20:42:42 +0300 Subject: Post-merge - trim trailing whitespace --- indra/newview/llpanelgroupcreate.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpanelgroupcreate.cpp') diff --git a/indra/newview/llpanelgroupcreate.cpp b/indra/newview/llpanelgroupcreate.cpp index 833de9b5e4..4a370525ff 100644 --- a/indra/newview/llpanelgroupcreate.cpp +++ b/indra/newview/llpanelgroupcreate.cpp @@ -1,24 +1,24 @@ -/** +/** * @file llpanelgroupcreate.cpp * * $LicenseInfo:firstyear=2019&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2019, 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$ */ -- cgit v1.2.3