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/lltoolselectland.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/lltoolselectland.h') diff --git a/indra/newview/lltoolselectland.h b/indra/newview/lltoolselectland.h index b5ba72f16d..dbddf07f49 100644 --- a/indra/newview/lltoolselectland.h +++ b/indra/newview/lltoolselectland.h @@ -39,10 +39,10 @@ class LLToolSelectLand virtual ~LLToolSelectLand(); public: - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleDoubleClick(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 handleDoubleClick(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 render(); // draw the select rectangle /*virtual*/ BOOL isAlwaysRendered() { return TRUE; } -- 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/lltoolselectland.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/lltoolselectland.h') diff --git a/indra/newview/lltoolselectland.h b/indra/newview/lltoolselectland.h index dbddf07f49..3aa86bc87d 100644 --- a/indra/newview/lltoolselectland.h +++ b/indra/newview/lltoolselectland.h @@ -44,19 +44,19 @@ public: /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask); /*virtual*/ void render(); // draw the select rectangle - /*virtual*/ BOOL isAlwaysRendered() { return TRUE; } + /*virtual*/ bool isAlwaysRendered() { return true; } /*virtual*/ void handleSelect(); /*virtual*/ void handleDeselect(); protected: - BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); + bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); void roundXY(LLVector3d& vec); protected: LLVector3d mDragStartGlobal; // global coords LLVector3d mDragEndGlobal; // global coords - BOOL mDragEndValid; // is drag end a valid point in the world? + bool mDragEndValid; // is drag end a valid point in the world? S32 mDragStartX; // screen coords, from left S32 mDragStartY; // screen coords, from bottom @@ -64,7 +64,7 @@ protected: S32 mDragEndX; S32 mDragEndY; - BOOL mMouseOutsideSlop; // has mouse ever gone outside slop region? + bool mMouseOutsideSlop; // has mouse ever gone outside slop region? LLVector3d mWestSouthBottom; // global coords, from drag LLVector3d mEastNorthTop; // global coords, from drag -- 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/lltoolselectland.h | 152 +++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'indra/newview/lltoolselectland.h') diff --git a/indra/newview/lltoolselectland.h b/indra/newview/lltoolselectland.h index e6184672ff..15672aa7d4 100644 --- a/indra/newview/lltoolselectland.h +++ b/indra/newview/lltoolselectland.h @@ -1,76 +1,76 @@ -/** - * @file lltoolselectland.h - * @brief LLToolSelectLand class header file - * - * $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$ - */ - -#ifndef LL_LLTOOLSELECTLAND_H -#define LL_LLTOOLSELECTLAND_H - -#include "lltool.h" -#include "v3dmath.h" - -class LLParcelSelection; - -class LLToolSelectLand -: public LLTool, public LLSingleton -{ - LLSINGLETON(LLToolSelectLand); - virtual ~LLToolSelectLand(); - -public: - /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask) override; - /*virtual*/ bool handleDoubleClick(S32 x, S32 y, MASK mask) override; - /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask) override; - /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask) override; - /*virtual*/ void render() override; // draw the select rectangle - /*virtual*/ bool isAlwaysRendered() override { return true; } - - /*virtual*/ void handleSelect() override; - /*virtual*/ void handleDeselect() override; - -protected: - bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); - void roundXY(LLVector3d& vec); - -protected: - LLVector3d mDragStartGlobal; // global coords - LLVector3d mDragEndGlobal; // global coords - bool mDragEndValid; // is drag end a valid point in the world? - - S32 mDragStartX; // screen coords, from left - S32 mDragStartY; // screen coords, from bottom - - S32 mDragEndX; - S32 mDragEndY; - - bool mMouseOutsideSlop; // has mouse ever gone outside slop region? - - LLVector3d mWestSouthBottom; // global coords, from drag - LLVector3d mEastNorthTop; // global coords, from drag - - LLSafeHandle mSelection; // hold on to a parcel selection -}; - - -#endif +/** + * @file lltoolselectland.h + * @brief LLToolSelectLand class header file + * + * $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$ + */ + +#ifndef LL_LLTOOLSELECTLAND_H +#define LL_LLTOOLSELECTLAND_H + +#include "lltool.h" +#include "v3dmath.h" + +class LLParcelSelection; + +class LLToolSelectLand +: public LLTool, public LLSingleton +{ + LLSINGLETON(LLToolSelectLand); + virtual ~LLToolSelectLand(); + +public: + /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask) override; + /*virtual*/ bool handleDoubleClick(S32 x, S32 y, MASK mask) override; + /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask) override; + /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask) override; + /*virtual*/ void render() override; // draw the select rectangle + /*virtual*/ bool isAlwaysRendered() override { return true; } + + /*virtual*/ void handleSelect() override; + /*virtual*/ void handleDeselect() override; + +protected: + bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); + void roundXY(LLVector3d& vec); + +protected: + LLVector3d mDragStartGlobal; // global coords + LLVector3d mDragEndGlobal; // global coords + bool mDragEndValid; // is drag end a valid point in the world? + + S32 mDragStartX; // screen coords, from left + S32 mDragStartY; // screen coords, from bottom + + S32 mDragEndX; + S32 mDragEndY; + + bool mMouseOutsideSlop; // has mouse ever gone outside slop region? + + LLVector3d mWestSouthBottom; // global coords, from drag + LLVector3d mEastNorthTop; // global coords, from drag + + LLSafeHandle mSelection; // hold on to a parcel selection +}; + + +#endif -- cgit v1.2.3