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/lltoolselectrect.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/lltoolselectrect.h') diff --git a/indra/newview/lltoolselectrect.h b/indra/newview/lltoolselectrect.h index 5fdf622b49..cbdac957dc 100644 --- a/indra/newview/lltoolselectrect.h +++ b/indra/newview/lltoolselectrect.h @@ -36,9 +36,9 @@ class LLToolSelectRect public: LLToolSelectRect( LLToolComposite* composite ); - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); virtual void draw(); // draw the select rectangle void handlePick(const LLPickInfo& pick); -- 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/lltoolselectrect.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltoolselectrect.h') diff --git a/indra/newview/lltoolselectrect.h b/indra/newview/lltoolselectrect.h index cbdac957dc..bdde50fb3d 100644 --- a/indra/newview/lltoolselectrect.h +++ b/indra/newview/lltoolselectrect.h @@ -45,7 +45,7 @@ public: protected: void handleRectangleSelection(S32 x, S32 y, MASK mask); // true if you selected one - BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); + bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); protected: S32 mDragStartX; // screen coords, from left @@ -57,7 +57,7 @@ protected: S32 mDragLastWidth; S32 mDragLastHeight; - BOOL mMouseOutsideSlop; // has mouse ever gone outside slop region? + bool mMouseOutsideSlop; // has mouse ever gone outside slop region? }; -- 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/lltoolselectrect.h | 128 +++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'indra/newview/lltoolselectrect.h') diff --git a/indra/newview/lltoolselectrect.h b/indra/newview/lltoolselectrect.h index bf10324081..514e08d252 100644 --- a/indra/newview/lltoolselectrect.h +++ b/indra/newview/lltoolselectrect.h @@ -1,64 +1,64 @@ -/** - * @file lltoolselectrect.h - * @brief A tool to select multiple objects with a screen-space rectangle. - * - * $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_LLTOOLSELECTRECT_H -#define LL_LLTOOLSELECTRECT_H - -#include "lltool.h" -#include "lltoolselect.h" - -class LLToolSelectRect -: public LLToolSelect -{ -public: - LLToolSelectRect( LLToolComposite* composite ); - - virtual bool handleMouseDown(S32 x, S32 y, MASK mask); - virtual bool handleMouseUp(S32 x, S32 y, MASK mask); - virtual bool handleHover(S32 x, S32 y, MASK mask); - virtual void draw(); // draw the select rectangle - - void handlePick(const LLPickInfo& pick); - -protected: - void handleRectangleSelection(S32 x, S32 y, MASK mask); // true if you selected one - bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); - -protected: - S32 mDragStartX; // screen coords, from left - S32 mDragStartY; // screen coords, from bottom - - S32 mDragEndX; - S32 mDragEndY; - - S32 mDragLastWidth; - S32 mDragLastHeight; - - bool mMouseOutsideSlop; // has mouse ever gone outside slop region? -}; - - -#endif +/** + * @file lltoolselectrect.h + * @brief A tool to select multiple objects with a screen-space rectangle. + * + * $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_LLTOOLSELECTRECT_H +#define LL_LLTOOLSELECTRECT_H + +#include "lltool.h" +#include "lltoolselect.h" + +class LLToolSelectRect +: public LLToolSelect +{ +public: + LLToolSelectRect( LLToolComposite* composite ); + + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); + virtual void draw(); // draw the select rectangle + + void handlePick(const LLPickInfo& pick); + +protected: + void handleRectangleSelection(S32 x, S32 y, MASK mask); // true if you selected one + bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); + +protected: + S32 mDragStartX; // screen coords, from left + S32 mDragStartY; // screen coords, from bottom + + S32 mDragEndX; + S32 mDragEndY; + + S32 mDragLastWidth; + S32 mDragLastHeight; + + bool mMouseOutsideSlop; // has mouse ever gone outside slop region? +}; + + +#endif -- cgit v1.2.3