From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 18 Feb 2024 12:52:19 +0100 Subject: Replace BOOL with bool in llwindow and dependent classes --- indra/newview/llcolorswatch.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llcolorswatch.h') diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h index a17cab486a..80826da73b 100644 --- a/indra/newview/llcolorswatch.h +++ b/indra/newview/llcolorswatch.h @@ -89,11 +89,11 @@ public: void showPicker(BOOL take_focus); - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleDoubleClick(S32 x,S32 y,MASK mask); - /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleUnicodeCharHere(llwchar uni_char); + /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleDoubleClick(S32 x,S32 y,MASK mask); + /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleUnicodeCharHere(llwchar uni_char); /*virtual*/ void draw(); /*virtual*/ void setEnabled( BOOL enabled ); -- cgit v1.2.3 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/llcolorswatch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llcolorswatch.h') diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h index 80826da73b..c02919064e 100644 --- a/indra/newview/llcolorswatch.h +++ b/indra/newview/llcolorswatch.h @@ -95,7 +95,7 @@ public: /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask); /*virtual*/ bool handleUnicodeCharHere(llwchar uni_char); /*virtual*/ void draw(); - /*virtual*/ void setEnabled( BOOL enabled ); + /*virtual*/ void setEnabled( bool enabled ); static void onColorChanged ( void* data, EColorPickOp pick_op = COLOR_CHANGE ); void closeFloaterColorPicker(); -- 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/llcolorswatch.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llcolorswatch.h') diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h index c02919064e..aa273daa78 100644 --- a/indra/newview/llcolorswatch.h +++ b/indra/newview/llcolorswatch.h @@ -76,18 +76,18 @@ public: /*virtual*/ LLSD getValue() const { return mColor.getValue(); } const LLColor4& get() { return mColor; } - void set(const LLColor4& color, BOOL update_picker = FALSE, BOOL from_event = FALSE); + void set(const LLColor4& color, bool update_picker = false, bool from_event = false); void setOriginal(const LLColor4& color); - void setValid(BOOL valid); + void setValid(bool valid); void setLabel(const std::string& label); void setLabelWidth(S32 label_width) {mLabelWidth =label_width;} - void setCanApplyImmediately(BOOL apply) { mCanApplyImmediately = apply; } + void setCanApplyImmediately(bool apply) { mCanApplyImmediately = apply; } void setOnCancelCallback(commit_callback_t cb) { mOnCancelCallback = cb; } void setOnSelectCallback(commit_callback_t cb) { mOnSelectCallback = cb; } void setPreviewCallback(commit_callback_t cb) { mPreviewCallback = cb; } void setFallbackImage(LLPointer image) { mFallbackImage = image; } - void showPicker(BOOL take_focus); + void showPicker(bool take_focus); /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); -- 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/llcolorswatch.h | 242 +++++++++++++++++++++--------------------- 1 file changed, 121 insertions(+), 121 deletions(-) (limited to 'indra/newview/llcolorswatch.h') diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h index b787600b5c..2ef715d648 100644 --- a/indra/newview/llcolorswatch.h +++ b/indra/newview/llcolorswatch.h @@ -1,121 +1,121 @@ -/** - * @file llcolorswatch.h - * @brief LLColorSwatch class definition - * - * $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$ - */ - -#ifndef LL_LLCOLORSWATCH_H -#define LL_LLCOLORSWATCH_H - -#include "lluictrl.h" -#include "v4color.h" -#include "llfloater.h" -#include "lltextbox.h" - -// -// Classes -// -class LLColor4; - -class LLColorSwatchCtrl -: public LLUICtrl -{ -public: - typedef enum e_color_pick_op - { - COLOR_CHANGE, - COLOR_SELECT, - COLOR_CANCEL - } EColorPickOp; - - struct Params : public LLInitParam::Block - { - Optional color; - Optional can_apply_immediately; - Optional alpha_background_image; - Optional cancel_callback; - Optional select_callback; - Optional preview_callback; - Optional border_color; - Optional label_width; - Optional label_height; - - Optional caption_text; - Optional border; - Params(); - }; - -protected: - LLColorSwatchCtrl(const Params& p); - friend class LLUICtrlFactory; -public: - ~LLColorSwatchCtrl (); - - /*virtual*/ void setValue(const LLSD& value); - - /*virtual*/ LLSD getValue() const { return mColor.getValue(); } - const LLColor4& get() { return mColor; } - - void set(const LLColor4& color, bool update_picker = false, bool from_event = false); - void setOriginal(const LLColor4& color); - void setValid(bool valid); - void setLabel(const std::string& label); - void setLabelWidth(S32 label_width) {mLabelWidth =label_width;} - void setCanApplyImmediately(bool apply) { mCanApplyImmediately = apply; } - void setOnCancelCallback(commit_callback_t cb) { mOnCancelCallback = cb; } - void setOnSelectCallback(commit_callback_t cb) { mOnSelectCallback = cb; } - void setPreviewCallback(commit_callback_t cb) { mPreviewCallback = cb; } - void setFallbackImage(LLPointer image) { mFallbackImage = image; } - - void showPicker(bool take_focus); - - /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); - /*virtual*/ bool handleDoubleClick(S32 x,S32 y,MASK mask); - /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask); - /*virtual*/ bool handleUnicodeCharHere(llwchar uni_char); - /*virtual*/ void draw(); - /*virtual*/ void setEnabled( bool enabled ); - - static void onColorChanged ( void* data, EColorPickOp pick_op = COLOR_CHANGE ); - void closeFloaterColorPicker(); - -protected: - bool mValid; - LLColor4 mColor; - LLUIColor mBorderColor; - LLTextBox* mCaption; - LLHandle mPickerHandle; - class LLViewBorder* mBorder; - bool mCanApplyImmediately; - commit_callback_t mOnCancelCallback, - mOnSelectCallback; - commit_callback_t mPreviewCallback; - S32 mLabelWidth, - mLabelHeight; - - LLPointer mAlphaGradientImage; - LLPointer mFallbackImage; -}; - -#endif // LL_LLBUTTON_H +/** + * @file llcolorswatch.h + * @brief LLColorSwatch class definition + * + * $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$ + */ + +#ifndef LL_LLCOLORSWATCH_H +#define LL_LLCOLORSWATCH_H + +#include "lluictrl.h" +#include "v4color.h" +#include "llfloater.h" +#include "lltextbox.h" + +// +// Classes +// +class LLColor4; + +class LLColorSwatchCtrl +: public LLUICtrl +{ +public: + typedef enum e_color_pick_op + { + COLOR_CHANGE, + COLOR_SELECT, + COLOR_CANCEL + } EColorPickOp; + + struct Params : public LLInitParam::Block + { + Optional color; + Optional can_apply_immediately; + Optional alpha_background_image; + Optional cancel_callback; + Optional select_callback; + Optional preview_callback; + Optional border_color; + Optional label_width; + Optional label_height; + + Optional caption_text; + Optional border; + Params(); + }; + +protected: + LLColorSwatchCtrl(const Params& p); + friend class LLUICtrlFactory; +public: + ~LLColorSwatchCtrl (); + + /*virtual*/ void setValue(const LLSD& value); + + /*virtual*/ LLSD getValue() const { return mColor.getValue(); } + const LLColor4& get() { return mColor; } + + void set(const LLColor4& color, bool update_picker = false, bool from_event = false); + void setOriginal(const LLColor4& color); + void setValid(bool valid); + void setLabel(const std::string& label); + void setLabelWidth(S32 label_width) {mLabelWidth =label_width;} + void setCanApplyImmediately(bool apply) { mCanApplyImmediately = apply; } + void setOnCancelCallback(commit_callback_t cb) { mOnCancelCallback = cb; } + void setOnSelectCallback(commit_callback_t cb) { mOnSelectCallback = cb; } + void setPreviewCallback(commit_callback_t cb) { mPreviewCallback = cb; } + void setFallbackImage(LLPointer image) { mFallbackImage = image; } + + void showPicker(bool take_focus); + + /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleDoubleClick(S32 x,S32 y,MASK mask); + /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleUnicodeCharHere(llwchar uni_char); + /*virtual*/ void draw(); + /*virtual*/ void setEnabled( bool enabled ); + + static void onColorChanged ( void* data, EColorPickOp pick_op = COLOR_CHANGE ); + void closeFloaterColorPicker(); + +protected: + bool mValid; + LLColor4 mColor; + LLUIColor mBorderColor; + LLTextBox* mCaption; + LLHandle mPickerHandle; + class LLViewBorder* mBorder; + bool mCanApplyImmediately; + commit_callback_t mOnCancelCallback, + mOnSelectCallback; + commit_callback_t mPreviewCallback; + S32 mLabelWidth, + mLabelHeight; + + LLPointer mAlphaGradientImage; + LLPointer mFallbackImage; +}; + +#endif // LL_LLBUTTON_H -- cgit v1.2.3