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/llui/llstyle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llui/llstyle.cpp') diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index bb731f4f7e..5b8b9a4e35 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -73,17 +73,17 @@ void LLStyle::setLinkHREF(const std::string& href) mLink = href; } -BOOL LLStyle::isLink() const +bool LLStyle::isLink() const { return mIsLink; } -BOOL LLStyle::isVisible() const +bool LLStyle::isVisible() const { return mVisible; } -void LLStyle::setVisible(BOOL is_visible) +void LLStyle::setVisible(bool is_visible) { mVisible = is_visible; } -- 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/llui/llstyle.cpp | 208 ++++++++++++++++++++++++------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) (limited to 'indra/llui/llstyle.cpp') diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index 19d98824c1..abf6e1284b 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -1,104 +1,104 @@ -/** - * @file llstyle.cpp - * @brief Text style class - * - * $LicenseInfo:firstyear=2001&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 "linden_common.h" - -#include "llstyle.h" - -#include "llfontgl.h" -#include "llstring.h" -#include "llui.h" - -LLStyle::Params::Params() -: visible("visible", true), - drop_shadow("drop_shadow", LLFontGL::NO_SHADOW), - color("color", LLColor4::black), - readonly_color("readonly_color", LLColor4::black), - selected_color("selected_color", LLColor4::black), - font("font", LLFontGL::getFontMonospace()), - image("image"), - link_href("href"), - is_link("is_link") -{} - - -LLStyle::LLStyle(const LLStyle::Params& p) -: mVisible(p.visible), - mColor(p.color), - mReadOnlyColor(p.readonly_color), - mSelectedColor(p.selected_color), - mFont(p.font()), - mLink(p.link_href), - mIsLink(p.is_link.isProvided() ? p.is_link : !p.link_href().empty()), - mDropShadow(p.drop_shadow), - mImagep(p.image()) -{} - -void LLStyle::setFont(const LLFontGL* font) -{ - mFont = font; -} - - -const LLFontGL* LLStyle::getFont() const -{ - return mFont; -} - -void LLStyle::setLinkHREF(const std::string& href) -{ - mLink = href; -} - -bool LLStyle::isLink() const -{ - return mIsLink; -} - -bool LLStyle::isVisible() const -{ - return mVisible; -} - -void LLStyle::setVisible(bool is_visible) -{ - mVisible = is_visible; -} - -LLPointer LLStyle::getImage() const -{ - return mImagep; -} - -void LLStyle::setImage(const LLUUID& src) -{ - mImagep = LLUI::getUIImageByID(src); -} - -void LLStyle::setImage(const std::string& name) -{ - mImagep = LLUI::getUIImage(name); -} +/** + * @file llstyle.cpp + * @brief Text style class + * + * $LicenseInfo:firstyear=2001&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 "linden_common.h" + +#include "llstyle.h" + +#include "llfontgl.h" +#include "llstring.h" +#include "llui.h" + +LLStyle::Params::Params() +: visible("visible", true), + drop_shadow("drop_shadow", LLFontGL::NO_SHADOW), + color("color", LLColor4::black), + readonly_color("readonly_color", LLColor4::black), + selected_color("selected_color", LLColor4::black), + font("font", LLFontGL::getFontMonospace()), + image("image"), + link_href("href"), + is_link("is_link") +{} + + +LLStyle::LLStyle(const LLStyle::Params& p) +: mVisible(p.visible), + mColor(p.color), + mReadOnlyColor(p.readonly_color), + mSelectedColor(p.selected_color), + mFont(p.font()), + mLink(p.link_href), + mIsLink(p.is_link.isProvided() ? p.is_link : !p.link_href().empty()), + mDropShadow(p.drop_shadow), + mImagep(p.image()) +{} + +void LLStyle::setFont(const LLFontGL* font) +{ + mFont = font; +} + + +const LLFontGL* LLStyle::getFont() const +{ + return mFont; +} + +void LLStyle::setLinkHREF(const std::string& href) +{ + mLink = href; +} + +bool LLStyle::isLink() const +{ + return mIsLink; +} + +bool LLStyle::isVisible() const +{ + return mVisible; +} + +void LLStyle::setVisible(bool is_visible) +{ + mVisible = is_visible; +} + +LLPointer LLStyle::getImage() const +{ + return mImagep; +} + +void LLStyle::setImage(const LLUUID& src) +{ + mImagep = LLUI::getUIImageByID(src); +} + +void LLStyle::setImage(const std::string& name) +{ + mImagep = LLUI::getUIImage(name); +} -- cgit v1.2.3