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/lltoolpie.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'indra/newview/lltoolpie.h') diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 8f6100e4b4..09df58e25d 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -42,17 +42,17 @@ class LLToolPie : public LLTool, public LLSingleton public: // Virtual functions inherited from LLMouseHandler - virtual BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down); - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + virtual bool handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, bool down); + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleRightMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); + virtual bool handleDoubleClick(S32 x, S32 y, MASK mask); BOOL handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y); - virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); - virtual BOOL handleScrollHWheel(S32 x, S32 y, S32 clicks); - virtual BOOL handleToolTip(S32 x, S32 y, MASK mask); + virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks); + virtual bool handleScrollHWheel(S32 x, S32 y, S32 clicks); + virtual bool handleToolTip(S32 x, S32 y, MASK mask); virtual void render(); -- 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/lltoolpie.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/lltoolpie.h') diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 09df58e25d..f746e35ef9 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -49,7 +49,7 @@ public: virtual bool handleRightMouseUp(S32 x, S32 y, MASK mask); virtual bool handleHover(S32 x, S32 y, MASK mask); virtual bool handleDoubleClick(S32 x, S32 y, MASK mask); - BOOL handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y); + bool handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y); virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks); virtual bool handleScrollHWheel(S32 x, S32 y, S32 clicks); virtual bool handleToolTip(S32 x, S32 y, MASK mask); @@ -81,10 +81,10 @@ public: static void VisitHomePage(const LLPickInfo& info); private: - BOOL outsideSlop (S32 x, S32 y, S32 start_x, S32 start_y); - BOOL handleLeftClickPick(); - BOOL handleRightClickPick(); - BOOL useClickAction (MASK mask, LLViewerObject* object,LLViewerObject* parent); + bool outsideSlop (S32 x, S32 y, S32 start_x, S32 start_y); + bool handleLeftClickPick(); + bool handleRightClickPick(); + bool useClickAction (MASK mask, LLViewerObject* object,LLViewerObject* parent); void showVisualContextMenuEffect(); ECursorType cursorFromObject(LLViewerObject* object); @@ -93,8 +93,8 @@ private: bool handleMediaDblClick(const LLPickInfo& info); bool handleMediaHover(const LLPickInfo& info); bool handleMediaMouseUp(); - BOOL handleTooltipLand(std::string line, std::string tooltip_msg); - BOOL handleTooltipObject( LLViewerObject* hover_object, std::string line, std::string tooltip_msg); + bool handleTooltipLand(std::string line, std::string tooltip_msg); + bool handleTooltipObject( LLViewerObject* hover_object, std::string line, std::string tooltip_msg); void steerCameraWithMouse(S32 x, S32 y); void startCameraSteering(); @@ -118,8 +118,8 @@ private: LLPointer mClickActionObject; U8 mClickAction; LLSafeHandle mLeftClickSelection; - BOOL mClickActionBuyEnabled; - BOOL mClickActionPayEnabled; + bool mClickActionBuyEnabled; + bool mClickActionPayEnabled; LLFrameTimer mDoubleClickTimer; }; -- 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/lltoolpie.h | 252 +++++++++++++++++++++++----------------------- 1 file changed, 126 insertions(+), 126 deletions(-) (limited to 'indra/newview/lltoolpie.h') diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 7151f64799..b3884a6bfc 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -1,126 +1,126 @@ -/** - * @file lltoolpie.h - * @brief LLToolPie 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_TOOLPIE_H -#define LL_TOOLPIE_H - -#include "lltool.h" -#include "lluuid.h" -#include "llviewerwindow.h" // for LLPickInfo -#include "llhudeffectblob.h" // for LLPointer, apparently - -class LLViewerObject; -class LLObjectSelection; - -class LLToolPie : public LLTool, public LLSingleton -{ - LLSINGLETON(LLToolPie); - LOG_CLASS(LLToolPie); -public: - - // Virtual functions inherited from LLMouseHandler - virtual bool handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, bool down) override; - virtual bool handleMouseDown(S32 x, S32 y, MASK mask) override; - virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask) override; - virtual bool handleMouseUp(S32 x, S32 y, MASK mask) override; - virtual bool handleRightMouseUp(S32 x, S32 y, MASK mask) override; - virtual bool handleHover(S32 x, S32 y, MASK mask) override; - virtual bool handleDoubleClick(S32 x, S32 y, MASK mask) override; - bool handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y); - virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks) override; - virtual bool handleScrollHWheel(S32 x, S32 y, S32 clicks) override; - virtual bool handleToolTip(S32 x, S32 y, MASK mask) override; - - virtual void render() override; - - virtual void stopEditing() override; - - virtual void onMouseCaptureLost() override; - virtual void handleSelect() override; - virtual void handleDeselect() override; - virtual LLTool* getOverrideTool(MASK mask) override; - - LLPickInfo& getPick() { return mPick; } - U8 getClickAction() { return mClickAction; } - LLViewerObject* getClickActionObject() { return mClickActionObject; } - LLObjectSelection* getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; } - void resetSelection(); - bool walkToClickedLocation(); - bool teleportToClickedLocation(); - void stopClickToWalk(); - - static void selectionPropertiesReceived(); - - static void showAvatarInspector(const LLUUID& avatar_id); - static void showObjectInspector(const LLUUID& object_id); - static void showObjectInspector(const LLUUID& object_id, const S32& object_face); - static void playCurrentMedia(const LLPickInfo& info); - static void VisitHomePage(const LLPickInfo& info); - -private: - bool outsideSlop (S32 x, S32 y, S32 start_x, S32 start_y); - bool handleLeftClickPick(); - bool handleRightClickPick(); - bool useClickAction (MASK mask, LLViewerObject* object,LLViewerObject* parent); - - void showVisualContextMenuEffect(); - ECursorType cursorFromObject(LLViewerObject* object); - - bool handleMediaClick(const LLPickInfo& info); - bool handleMediaDblClick(const LLPickInfo& info); - bool handleMediaHover(const LLPickInfo& info); - bool handleMediaMouseUp(); - bool handleTooltipLand(std::string line, std::string tooltip_msg); - bool handleTooltipObject( LLViewerObject* hover_object, std::string line, std::string tooltip_msg); - - void steerCameraWithMouse(S32 x, S32 y); - void startCameraSteering(); - void stopCameraSteering(); - bool inCameraSteerMode(); - -private: - bool mMouseButtonDown; - bool mMouseOutsideSlop; // for this drag, has mouse moved outside slop region - S32 mMouseDownX; - S32 mMouseDownY; - S32 mMouseSteerX; - S32 mMouseSteerY; - LLPointer mAutoPilotDestination; - LLPointer mMouseSteerGrabPoint; - bool mClockwise; - LLUUID mMediaMouseCaptureID; - LLPickInfo mPick; - LLPickInfo mHoverPick; - LLPickInfo mSteerPick; - LLPointer mClickActionObject; - U8 mClickAction; - LLSafeHandle mLeftClickSelection; - bool mClickActionBuyEnabled; - bool mClickActionPayEnabled; - LLFrameTimer mDoubleClickTimer; -}; - -#endif +/** + * @file lltoolpie.h + * @brief LLToolPie 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_TOOLPIE_H +#define LL_TOOLPIE_H + +#include "lltool.h" +#include "lluuid.h" +#include "llviewerwindow.h" // for LLPickInfo +#include "llhudeffectblob.h" // for LLPointer, apparently + +class LLViewerObject; +class LLObjectSelection; + +class LLToolPie : public LLTool, public LLSingleton +{ + LLSINGLETON(LLToolPie); + LOG_CLASS(LLToolPie); +public: + + // Virtual functions inherited from LLMouseHandler + virtual bool handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, bool down) override; + virtual bool handleMouseDown(S32 x, S32 y, MASK mask) override; + virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask) override; + virtual bool handleMouseUp(S32 x, S32 y, MASK mask) override; + virtual bool handleRightMouseUp(S32 x, S32 y, MASK mask) override; + virtual bool handleHover(S32 x, S32 y, MASK mask) override; + virtual bool handleDoubleClick(S32 x, S32 y, MASK mask) override; + bool handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y); + virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks) override; + virtual bool handleScrollHWheel(S32 x, S32 y, S32 clicks) override; + virtual bool handleToolTip(S32 x, S32 y, MASK mask) override; + + virtual void render() override; + + virtual void stopEditing() override; + + virtual void onMouseCaptureLost() override; + virtual void handleSelect() override; + virtual void handleDeselect() override; + virtual LLTool* getOverrideTool(MASK mask) override; + + LLPickInfo& getPick() { return mPick; } + U8 getClickAction() { return mClickAction; } + LLViewerObject* getClickActionObject() { return mClickActionObject; } + LLObjectSelection* getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; } + void resetSelection(); + bool walkToClickedLocation(); + bool teleportToClickedLocation(); + void stopClickToWalk(); + + static void selectionPropertiesReceived(); + + static void showAvatarInspector(const LLUUID& avatar_id); + static void showObjectInspector(const LLUUID& object_id); + static void showObjectInspector(const LLUUID& object_id, const S32& object_face); + static void playCurrentMedia(const LLPickInfo& info); + static void VisitHomePage(const LLPickInfo& info); + +private: + bool outsideSlop (S32 x, S32 y, S32 start_x, S32 start_y); + bool handleLeftClickPick(); + bool handleRightClickPick(); + bool useClickAction (MASK mask, LLViewerObject* object,LLViewerObject* parent); + + void showVisualContextMenuEffect(); + ECursorType cursorFromObject(LLViewerObject* object); + + bool handleMediaClick(const LLPickInfo& info); + bool handleMediaDblClick(const LLPickInfo& info); + bool handleMediaHover(const LLPickInfo& info); + bool handleMediaMouseUp(); + bool handleTooltipLand(std::string line, std::string tooltip_msg); + bool handleTooltipObject( LLViewerObject* hover_object, std::string line, std::string tooltip_msg); + + void steerCameraWithMouse(S32 x, S32 y); + void startCameraSteering(); + void stopCameraSteering(); + bool inCameraSteerMode(); + +private: + bool mMouseButtonDown; + bool mMouseOutsideSlop; // for this drag, has mouse moved outside slop region + S32 mMouseDownX; + S32 mMouseDownY; + S32 mMouseSteerX; + S32 mMouseSteerY; + LLPointer mAutoPilotDestination; + LLPointer mMouseSteerGrabPoint; + bool mClockwise; + LLUUID mMediaMouseCaptureID; + LLPickInfo mPick; + LLPickInfo mHoverPick; + LLPickInfo mSteerPick; + LLPointer mClickActionObject; + U8 mClickAction; + LLSafeHandle mLeftClickSelection; + bool mClickActionBuyEnabled; + bool mClickActionPayEnabled; + LLFrameTimer mDoubleClickTimer; +}; + +#endif -- cgit v1.2.3