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/lltoolfocus.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/lltoolfocus.h') diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h index ef71f9230a..9eff910229 100644 --- a/indra/newview/lltoolfocus.h +++ b/indra/newview/lltoolfocus.h @@ -38,9 +38,9 @@ class LLToolCamera virtual ~LLToolCamera(); public: - 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 onMouseCaptureLost(); -- 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/lltoolfocus.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/lltoolfocus.h') diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h index 9eff910229..a72f5888a3 100644 --- a/indra/newview/lltoolfocus.h +++ b/indra/newview/lltoolfocus.h @@ -51,7 +51,7 @@ public: void setClickPickPending() { mClickPickPending = true; } static void pickCallback(const LLPickInfo& pick_info); - BOOL mouseSteerMode() { return mMouseSteering; } + bool mouseSteerMode() { return mMouseSteering; } protected: // called from handleMouseUp and onMouseCaptureLost to "let go" @@ -63,20 +63,20 @@ protected: S32 mAccumY; S32 mMouseDownX; S32 mMouseDownY; - BOOL mOutsideSlopX; - BOOL mOutsideSlopY; - BOOL mValidClickPoint; + bool mOutsideSlopX; + bool mOutsideSlopY; + bool mValidClickPoint; bool mClickPickPending; - BOOL mValidSelection; - BOOL mMouseSteering; + bool mValidSelection; + bool mMouseSteering; S32 mMouseUpX; // needed for releaseMouse() S32 mMouseUpY; MASK mMouseUpMask; }; -extern BOOL gCameraBtnOrbit; -extern BOOL gCameraBtnPan; -extern BOOL gCameraBtnZoom; +extern bool gCameraBtnOrbit; +extern bool gCameraBtnPan; +extern bool gCameraBtnZoom; #endif -- 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/lltoolfocus.h | 164 ++++++++++++++++++++++---------------------- 1 file changed, 82 insertions(+), 82 deletions(-) (limited to 'indra/newview/lltoolfocus.h') diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h index e7a78e0468..c2460e7aa4 100644 --- a/indra/newview/lltoolfocus.h +++ b/indra/newview/lltoolfocus.h @@ -1,82 +1,82 @@ -/** - * @file lltoolfocus.h - * @brief A tool to set the build focus point. - * - * $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_LLTOOLFOCUS_H -#define LL_LLTOOLFOCUS_H - -#include "lltool.h" - -class LLPickInfo; - -class LLToolCamera -: public LLTool, public LLSingleton -{ - LLSINGLETON(LLToolCamera); - virtual ~LLToolCamera(); -public: - - virtual bool handleMouseDown(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 onMouseCaptureLost() override; - - virtual void handleSelect() override; - virtual void handleDeselect() override; - - virtual LLTool* getOverrideTool(MASK mask) override { return NULL; } - - void setClickPickPending() { mClickPickPending = true; } - static void pickCallback(const LLPickInfo& pick_info); - bool mouseSteerMode() { return mMouseSteering; } - -protected: - // called from handleMouseUp and onMouseCaptureLost to "let go" - // of the mouse and make it visible JC - void releaseMouse(); - -protected: - S32 mAccumX; - S32 mAccumY; - S32 mMouseDownX; - S32 mMouseDownY; - bool mOutsideSlopX; - bool mOutsideSlopY; - bool mValidClickPoint; - bool mClickPickPending; - bool mValidSelection; - bool mMouseSteering; - S32 mMouseUpX; // needed for releaseMouse() - S32 mMouseUpY; - MASK mMouseUpMask; -}; - - -extern bool gCameraBtnOrbit; -extern bool gCameraBtnPan; -extern bool gCameraBtnZoom; - -#endif +/** + * @file lltoolfocus.h + * @brief A tool to set the build focus point. + * + * $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_LLTOOLFOCUS_H +#define LL_LLTOOLFOCUS_H + +#include "lltool.h" + +class LLPickInfo; + +class LLToolCamera +: public LLTool, public LLSingleton +{ + LLSINGLETON(LLToolCamera); + virtual ~LLToolCamera(); +public: + + virtual bool handleMouseDown(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 onMouseCaptureLost() override; + + virtual void handleSelect() override; + virtual void handleDeselect() override; + + virtual LLTool* getOverrideTool(MASK mask) override { return NULL; } + + void setClickPickPending() { mClickPickPending = true; } + static void pickCallback(const LLPickInfo& pick_info); + bool mouseSteerMode() { return mMouseSteering; } + +protected: + // called from handleMouseUp and onMouseCaptureLost to "let go" + // of the mouse and make it visible JC + void releaseMouse(); + +protected: + S32 mAccumX; + S32 mAccumY; + S32 mMouseDownX; + S32 mMouseDownY; + bool mOutsideSlopX; + bool mOutsideSlopY; + bool mValidClickPoint; + bool mClickPickPending; + bool mValidSelection; + bool mMouseSteering; + S32 mMouseUpX; // needed for releaseMouse() + S32 mMouseUpY; + MASK mMouseUpMask; +}; + + +extern bool gCameraBtnOrbit; +extern bool gCameraBtnPan; +extern bool gCameraBtnZoom; + +#endif -- cgit v1.2.3