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/lltoolobjpicker.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/lltoolobjpicker.h') diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h index 5ad9b67e21..960ae0fd56 100644 --- a/indra/newview/lltoolobjpicker.h +++ b/indra/newview/lltoolobjpicker.h @@ -38,9 +38,9 @@ class LLToolObjPicker : public LLTool, public LLSingleton LLSINGLETON(LLToolObjPicker); 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 handleSelect(); virtual void handleDeselect(); -- 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/lltoolobjpicker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltoolobjpicker.h') diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h index 960ae0fd56..2238aefa08 100644 --- a/indra/newview/lltoolobjpicker.h +++ b/indra/newview/lltoolobjpicker.h @@ -54,7 +54,7 @@ public: static void pickCallback(const LLPickInfo& pick_info); protected: - BOOL mPicked; + bool mPicked; LLUUID mHitObjectID; void (*mExitCallback)(void *callback_data); void *mExitCallbackData; -- 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/lltoolobjpicker.h | 128 ++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'indra/newview/lltoolobjpicker.h') diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h index 95a62fbf2e..3420541a31 100644 --- a/indra/newview/lltoolobjpicker.h +++ b/indra/newview/lltoolobjpicker.h @@ -1,64 +1,64 @@ -/** - * @file lltoolobjpicker.h - * @brief LLToolObjPicker class header file - * - * $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_TOOLOBJPICKER_H -#define LL_TOOLOBJPICKER_H - -#include "lltool.h" -#include "v3math.h" -#include "lluuid.h" - -class LLPickInfo; - -class LLToolObjPicker : public LLTool, public LLSingleton -{ - LLSINGLETON(LLToolObjPicker); -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 handleSelect() override; - virtual void handleDeselect() override; - - virtual void onMouseCaptureLost() override; - - void setExitCallback(void (*callback)(void *), void *callback_data); - - LLUUID getObjectID() const { return mHitObjectID; } - - static void pickCallback(const LLPickInfo& pick_info); - -protected: - bool mPicked; - LLUUID mHitObjectID; - void (*mExitCallback)(void *callback_data); - void *mExitCallbackData; -}; - - -#endif +/** + * @file lltoolobjpicker.h + * @brief LLToolObjPicker class header file + * + * $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_TOOLOBJPICKER_H +#define LL_TOOLOBJPICKER_H + +#include "lltool.h" +#include "v3math.h" +#include "lluuid.h" + +class LLPickInfo; + +class LLToolObjPicker : public LLTool, public LLSingleton +{ + LLSINGLETON(LLToolObjPicker); +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 handleSelect() override; + virtual void handleDeselect() override; + + virtual void onMouseCaptureLost() override; + + void setExitCallback(void (*callback)(void *), void *callback_data); + + LLUUID getObjectID() const { return mHitObjectID; } + + static void pickCallback(const LLPickInfo& pick_info); + +protected: + bool mPicked; + LLUUID mHitObjectID; + void (*mExitCallback)(void *callback_data); + void *mExitCallbackData; +}; + + +#endif -- cgit v1.2.3