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/llsidepanelinventorysubpanel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llsidepanelinventorysubpanel.cpp') diff --git a/indra/newview/llsidepanelinventorysubpanel.cpp b/indra/newview/llsidepanelinventorysubpanel.cpp index 3b73b6b7dd..a54ee36dda 100644 --- a/indra/newview/llsidepanelinventorysubpanel.cpp +++ b/indra/newview/llsidepanelinventorysubpanel.cpp @@ -60,7 +60,7 @@ LLSidepanelInventorySubpanel::~LLSidepanelInventorySubpanel() } // virtual -BOOL LLSidepanelInventorySubpanel::postBuild() +bool LLSidepanelInventorySubpanel::postBuild() { mCancelBtn = findChild("cancel_btn"); @@ -68,10 +68,10 @@ BOOL LLSidepanelInventorySubpanel::postBuild() { mCancelBtn->setClickedCallback(boost::bind(&LLSidepanelInventorySubpanel::onCancelButtonClicked, this)); } - return TRUE; + return true; } -void LLSidepanelInventorySubpanel::setVisible(BOOL visible) +void LLSidepanelInventorySubpanel::setVisible(bool visible) { if (visible) { -- 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/llsidepanelinventorysubpanel.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/llsidepanelinventorysubpanel.cpp') diff --git a/indra/newview/llsidepanelinventorysubpanel.cpp b/indra/newview/llsidepanelinventorysubpanel.cpp index a54ee36dda..58982a38f5 100644 --- a/indra/newview/llsidepanelinventorysubpanel.cpp +++ b/indra/newview/llsidepanelinventorysubpanel.cpp @@ -48,8 +48,8 @@ // Default constructor LLSidepanelInventorySubpanel::LLSidepanelInventorySubpanel(const LLPanel::Params& p) : LLPanel(p), - mIsDirty(TRUE), - mIsEditing(FALSE), + mIsDirty(true), + mIsEditing(false), mCancelBtn(NULL) { } @@ -80,22 +80,22 @@ void LLSidepanelInventorySubpanel::setVisible(bool visible) LLPanel::setVisible(visible); } -void LLSidepanelInventorySubpanel::setIsEditing(BOOL edit) +void LLSidepanelInventorySubpanel::setIsEditing(bool edit) { mIsEditing = edit; - mIsDirty = TRUE; + mIsDirty = true; } -BOOL LLSidepanelInventorySubpanel::getIsEditing() const +bool LLSidepanelInventorySubpanel::getIsEditing() const { - return TRUE; // Default everything to edit mode since we're not using an edit button anymore. + return true; // Default everything to edit mode since we're not using an edit button anymore. // return mIsEditing; } void LLSidepanelInventorySubpanel::reset() { - mIsDirty = TRUE; + mIsDirty = true; } void LLSidepanelInventorySubpanel::draw() @@ -104,7 +104,7 @@ void LLSidepanelInventorySubpanel::draw() { refresh(); updateVerbs(); - mIsDirty = FALSE; + mIsDirty = false; } LLPanel::draw(); @@ -112,8 +112,8 @@ void LLSidepanelInventorySubpanel::draw() void LLSidepanelInventorySubpanel::dirty() { - mIsDirty = TRUE; - setIsEditing(FALSE); + mIsDirty = true; + setIsEditing(false); } void LLSidepanelInventorySubpanel::updateVerbs() @@ -126,14 +126,14 @@ void LLSidepanelInventorySubpanel::updateVerbs() void LLSidepanelInventorySubpanel::onEditButtonClicked() { - setIsEditing(TRUE); + setIsEditing(true); refresh(); updateVerbs(); } void LLSidepanelInventorySubpanel::onCancelButtonClicked() { - setIsEditing(FALSE); + setIsEditing(false); refresh(); updateVerbs(); } -- 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/llsidepanelinventorysubpanel.cpp | 278 ++++++++++++------------- 1 file changed, 139 insertions(+), 139 deletions(-) (limited to 'indra/newview/llsidepanelinventorysubpanel.cpp') diff --git a/indra/newview/llsidepanelinventorysubpanel.cpp b/indra/newview/llsidepanelinventorysubpanel.cpp index c11d24895d..820ceed296 100644 --- a/indra/newview/llsidepanelinventorysubpanel.cpp +++ b/indra/newview/llsidepanelinventorysubpanel.cpp @@ -1,139 +1,139 @@ -/** - * @file llsidepanelinventorysubpanel.cpp - * @brief A floater which shows an inventory item's properties. - * - * $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$ - */ - -#include "llviewerprecompiledheaders.h" -#include "llsidepanelinventorysubpanel.h" - -#include "roles_constants.h" - -#include "llagent.h" -#include "llavataractions.h" -#include "llbutton.h" -#include "llfloaterreg.h" -#include "llgroupactions.h" -#include "llinventorymodel.h" -#include "lllineeditor.h" -#include "llradiogroup.h" -#include "llviewercontrol.h" -#include "llviewerobjectlist.h" - - -///---------------------------------------------------------------------------- -/// Class LLSidepanelInventorySubpanel -///---------------------------------------------------------------------------- - -// Default constructor -LLSidepanelInventorySubpanel::LLSidepanelInventorySubpanel(const LLPanel::Params& p) - : LLPanel(p), - mIsDirty(true), - mIsEditing(false), - mCancelBtn(NULL) -{ -} - -// Destroys the object -LLSidepanelInventorySubpanel::~LLSidepanelInventorySubpanel() -{ -} - -// virtual -bool LLSidepanelInventorySubpanel::postBuild() -{ - - mCancelBtn = findChild("cancel_btn"); - if (mCancelBtn) - { - mCancelBtn->setClickedCallback(boost::bind(&LLSidepanelInventorySubpanel::onCancelButtonClicked, this)); - } - return true; -} - -void LLSidepanelInventorySubpanel::setVisible(bool visible) -{ - if (visible) - { - dirty(); - } - LLPanel::setVisible(visible); -} - -void LLSidepanelInventorySubpanel::setIsEditing(bool edit) -{ - mIsEditing = edit; - mIsDirty = true; -} - -bool LLSidepanelInventorySubpanel::getIsEditing() const -{ - - return true; // Default everything to edit mode since we're not using an edit button anymore. - // return mIsEditing; -} - -void LLSidepanelInventorySubpanel::reset() -{ - mIsDirty = true; -} - -void LLSidepanelInventorySubpanel::draw() -{ - if (mIsDirty) - { - refresh(); - updateVerbs(); - mIsDirty = false; - } - - LLPanel::draw(); -} - -void LLSidepanelInventorySubpanel::dirty() -{ - mIsDirty = true; - setIsEditing(false); -} - -void LLSidepanelInventorySubpanel::updateVerbs() -{ - if (mCancelBtn) - { - mCancelBtn->setVisible(mIsEditing); - } -} - -void LLSidepanelInventorySubpanel::onEditButtonClicked() -{ - setIsEditing(true); - refresh(); - updateVerbs(); -} - -void LLSidepanelInventorySubpanel::onCancelButtonClicked() -{ - setIsEditing(false); - refresh(); - updateVerbs(); -} +/** + * @file llsidepanelinventorysubpanel.cpp + * @brief A floater which shows an inventory item's properties. + * + * $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$ + */ + +#include "llviewerprecompiledheaders.h" +#include "llsidepanelinventorysubpanel.h" + +#include "roles_constants.h" + +#include "llagent.h" +#include "llavataractions.h" +#include "llbutton.h" +#include "llfloaterreg.h" +#include "llgroupactions.h" +#include "llinventorymodel.h" +#include "lllineeditor.h" +#include "llradiogroup.h" +#include "llviewercontrol.h" +#include "llviewerobjectlist.h" + + +///---------------------------------------------------------------------------- +/// Class LLSidepanelInventorySubpanel +///---------------------------------------------------------------------------- + +// Default constructor +LLSidepanelInventorySubpanel::LLSidepanelInventorySubpanel(const LLPanel::Params& p) + : LLPanel(p), + mIsDirty(true), + mIsEditing(false), + mCancelBtn(NULL) +{ +} + +// Destroys the object +LLSidepanelInventorySubpanel::~LLSidepanelInventorySubpanel() +{ +} + +// virtual +bool LLSidepanelInventorySubpanel::postBuild() +{ + + mCancelBtn = findChild("cancel_btn"); + if (mCancelBtn) + { + mCancelBtn->setClickedCallback(boost::bind(&LLSidepanelInventorySubpanel::onCancelButtonClicked, this)); + } + return true; +} + +void LLSidepanelInventorySubpanel::setVisible(bool visible) +{ + if (visible) + { + dirty(); + } + LLPanel::setVisible(visible); +} + +void LLSidepanelInventorySubpanel::setIsEditing(bool edit) +{ + mIsEditing = edit; + mIsDirty = true; +} + +bool LLSidepanelInventorySubpanel::getIsEditing() const +{ + + return true; // Default everything to edit mode since we're not using an edit button anymore. + // return mIsEditing; +} + +void LLSidepanelInventorySubpanel::reset() +{ + mIsDirty = true; +} + +void LLSidepanelInventorySubpanel::draw() +{ + if (mIsDirty) + { + refresh(); + updateVerbs(); + mIsDirty = false; + } + + LLPanel::draw(); +} + +void LLSidepanelInventorySubpanel::dirty() +{ + mIsDirty = true; + setIsEditing(false); +} + +void LLSidepanelInventorySubpanel::updateVerbs() +{ + if (mCancelBtn) + { + mCancelBtn->setVisible(mIsEditing); + } +} + +void LLSidepanelInventorySubpanel::onEditButtonClicked() +{ + setIsEditing(true); + refresh(); + updateVerbs(); +} + +void LLSidepanelInventorySubpanel::onCancelButtonClicked() +{ + setIsEditing(false); + refresh(); + updateVerbs(); +} -- cgit v1.2.3