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.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/lltoolobjpicker.cpp') diff --git a/indra/newview/lltoolobjpicker.cpp b/indra/newview/lltoolobjpicker.cpp index 0d9fe9e577..6638fe4682 100644 --- a/indra/newview/lltoolobjpicker.cpp +++ b/indra/newview/lltoolobjpicker.cpp @@ -55,10 +55,10 @@ LLToolObjPicker::LLToolObjPicker() // returns TRUE if an object was selected -BOOL LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask) +bool LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask) { LLRootView* viewp = gViewerWindow->getRootView(); - BOOL handled = viewp->handleMouseDown(x, y, mask); + bool handled = viewp->handleMouseDown(x, y, mask); mHitObjectID.setNull(); @@ -93,10 +93,10 @@ void LLToolObjPicker::pickCallback(const LLPickInfo& pick_info) } -BOOL LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask) +bool LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask) { LLView* viewp = gViewerWindow->getRootView(); - BOOL handled = viewp->handleHover(x, y, mask); + bool handled = viewp->handleHover(x, y, mask); if (handled) { // let UI handle this @@ -115,7 +115,7 @@ BOOL LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask) } -BOOL LLToolObjPicker::handleHover(S32 x, S32 y, MASK mask) +bool LLToolObjPicker::handleHover(S32 x, S32 y, MASK mask) { LLView *viewp = gViewerWindow->getRootView(); BOOL handled = viewp->handleHover(x, y, mask); -- 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.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/lltoolobjpicker.cpp') diff --git a/indra/newview/lltoolobjpicker.cpp b/indra/newview/lltoolobjpicker.cpp index 6638fe4682..3d3855030e 100644 --- a/indra/newview/lltoolobjpicker.cpp +++ b/indra/newview/lltoolobjpicker.cpp @@ -47,14 +47,14 @@ LLToolObjPicker::LLToolObjPicker() : LLTool( std::string("ObjPicker"), NULL ), - mPicked( FALSE ), + mPicked( false ), mHitObjectID( LLUUID::null ), mExitCallback( NULL ), mExitCallbackData( NULL ) { } -// returns TRUE if an object was selected +// returns true if an object was selected bool LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask) { LLRootView* viewp = gViewerWindow->getRootView(); @@ -66,13 +66,13 @@ bool LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask) { // didn't click in any UI object, so must have clicked in the world gViewerWindow->pickAsync(x, y, mask, pickCallback); - handled = TRUE; + handled = true; } else { if (hasMouseCapture()) { - setMouseCapture(FALSE); + setMouseCapture(false); } else { @@ -105,7 +105,7 @@ bool LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask) LLTool::handleMouseUp(x, y, mask); if (hasMouseCapture()) { - setMouseCapture(FALSE); + setMouseCapture(false); } else { @@ -118,7 +118,7 @@ bool LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask) bool LLToolObjPicker::handleHover(S32 x, S32 y, MASK mask) { LLView *viewp = gViewerWindow->getRootView(); - BOOL handled = viewp->handleHover(x, y, mask); + bool handled = viewp->handleHover(x, y, mask); if (!handled) { // Used to do pick on hover. Now we just always display the cursor. @@ -142,7 +142,7 @@ void LLToolObjPicker::onMouseCaptureLost() mExitCallbackData = NULL; } - mPicked = FALSE; + mPicked = false; mHitObjectID.setNull(); } @@ -157,7 +157,7 @@ void LLToolObjPicker::setExitCallback(void (*callback)(void *), void *callback_d void LLToolObjPicker::handleSelect() { LLTool::handleSelect(); - setMouseCapture(TRUE); + setMouseCapture(true); } // virtual @@ -166,7 +166,7 @@ void LLToolObjPicker::handleDeselect() if (hasMouseCapture()) { LLTool::handleDeselect(); - setMouseCapture(FALSE); + setMouseCapture(false); } } -- 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.cpp | 348 +++++++++++++++++++------------------- 1 file changed, 174 insertions(+), 174 deletions(-) (limited to 'indra/newview/lltoolobjpicker.cpp') diff --git a/indra/newview/lltoolobjpicker.cpp b/indra/newview/lltoolobjpicker.cpp index 242bc48832..20089b15a3 100644 --- a/indra/newview/lltoolobjpicker.cpp +++ b/indra/newview/lltoolobjpicker.cpp @@ -1,174 +1,174 @@ -/** - * @file lltoolobjpicker.cpp - * @brief LLToolObjPicker class implementation - * - * $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$ - */ - -// LLToolObjPicker is a transient tool, useful for a single object pick. - -#include "llviewerprecompiledheaders.h" - -#include "lltoolobjpicker.h" - -#include "llagent.h" -#include "llselectmgr.h" -#include "llworld.h" -#include "llviewercontrol.h" -#include "llmenugl.h" -#include "lltoolmgr.h" -#include "llviewerobject.h" -#include "llviewerobjectlist.h" -#include "llviewermenu.h" -#include "llviewercamera.h" -#include "llviewerwindow.h" -#include "lldrawable.h" -#include "llrootview.h" - - -LLToolObjPicker::LLToolObjPicker() -: LLTool( std::string("ObjPicker"), NULL ), - mPicked( false ), - mHitObjectID( LLUUID::null ), - mExitCallback( NULL ), - mExitCallbackData( NULL ) -{ } - - -// returns true if an object was selected -bool LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask) -{ - LLRootView* viewp = gViewerWindow->getRootView(); - bool handled = viewp->handleMouseDown(x, y, mask); - - mHitObjectID.setNull(); - - if (! handled) - { - // didn't click in any UI object, so must have clicked in the world - gViewerWindow->pickAsync(x, y, mask, pickCallback); - handled = true; - } - else - { - if (hasMouseCapture()) - { - setMouseCapture(false); - } - else - { - LL_WARNS() << "PickerTool doesn't have mouse capture on mouseDown" << LL_ENDL; - } - } - - // Pass mousedown to base class - LLTool::handleMouseDown(x, y, mask); - - return handled; -} - -void LLToolObjPicker::pickCallback(const LLPickInfo& pick_info) -{ - LLToolObjPicker::getInstance()->mHitObjectID = pick_info.mObjectID; - LLToolObjPicker::getInstance()->mPicked = pick_info.mObjectID.notNull(); -} - - -bool LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask) -{ - LLView* viewp = gViewerWindow->getRootView(); - bool handled = viewp->handleHover(x, y, mask); - if (handled) - { - // let UI handle this - } - - LLTool::handleMouseUp(x, y, mask); - if (hasMouseCapture()) - { - setMouseCapture(false); - } - else - { - LL_WARNS() << "PickerTool doesn't have mouse capture on mouseUp" << LL_ENDL; - } - return handled; -} - - -bool LLToolObjPicker::handleHover(S32 x, S32 y, MASK mask) -{ - LLView *viewp = gViewerWindow->getRootView(); - bool handled = viewp->handleHover(x, y, mask); - if (!handled) - { - // Used to do pick on hover. Now we just always display the cursor. - ECursorType cursor = UI_CURSOR_ARROWLOCKED; - - cursor = UI_CURSOR_TOOLPICKOBJECT3; - - gViewerWindow->setCursor(cursor); - } - return handled; -} - - -void LLToolObjPicker::onMouseCaptureLost() -{ - if (mExitCallback) - { - mExitCallback(mExitCallbackData); - - mExitCallback = NULL; - mExitCallbackData = NULL; - } - - mPicked = false; - mHitObjectID.setNull(); -} - -// virtual -void LLToolObjPicker::setExitCallback(void (*callback)(void *), void *callback_data) -{ - mExitCallback = callback; - mExitCallbackData = callback_data; -} - -// virtual -void LLToolObjPicker::handleSelect() -{ - LLTool::handleSelect(); - setMouseCapture(true); -} - -// virtual -void LLToolObjPicker::handleDeselect() -{ - if (hasMouseCapture()) - { - LLTool::handleDeselect(); - setMouseCapture(false); - } -} - - - +/** + * @file lltoolobjpicker.cpp + * @brief LLToolObjPicker class implementation + * + * $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$ + */ + +// LLToolObjPicker is a transient tool, useful for a single object pick. + +#include "llviewerprecompiledheaders.h" + +#include "lltoolobjpicker.h" + +#include "llagent.h" +#include "llselectmgr.h" +#include "llworld.h" +#include "llviewercontrol.h" +#include "llmenugl.h" +#include "lltoolmgr.h" +#include "llviewerobject.h" +#include "llviewerobjectlist.h" +#include "llviewermenu.h" +#include "llviewercamera.h" +#include "llviewerwindow.h" +#include "lldrawable.h" +#include "llrootview.h" + + +LLToolObjPicker::LLToolObjPicker() +: LLTool( std::string("ObjPicker"), NULL ), + mPicked( false ), + mHitObjectID( LLUUID::null ), + mExitCallback( NULL ), + mExitCallbackData( NULL ) +{ } + + +// returns true if an object was selected +bool LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask) +{ + LLRootView* viewp = gViewerWindow->getRootView(); + bool handled = viewp->handleMouseDown(x, y, mask); + + mHitObjectID.setNull(); + + if (! handled) + { + // didn't click in any UI object, so must have clicked in the world + gViewerWindow->pickAsync(x, y, mask, pickCallback); + handled = true; + } + else + { + if (hasMouseCapture()) + { + setMouseCapture(false); + } + else + { + LL_WARNS() << "PickerTool doesn't have mouse capture on mouseDown" << LL_ENDL; + } + } + + // Pass mousedown to base class + LLTool::handleMouseDown(x, y, mask); + + return handled; +} + +void LLToolObjPicker::pickCallback(const LLPickInfo& pick_info) +{ + LLToolObjPicker::getInstance()->mHitObjectID = pick_info.mObjectID; + LLToolObjPicker::getInstance()->mPicked = pick_info.mObjectID.notNull(); +} + + +bool LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask) +{ + LLView* viewp = gViewerWindow->getRootView(); + bool handled = viewp->handleHover(x, y, mask); + if (handled) + { + // let UI handle this + } + + LLTool::handleMouseUp(x, y, mask); + if (hasMouseCapture()) + { + setMouseCapture(false); + } + else + { + LL_WARNS() << "PickerTool doesn't have mouse capture on mouseUp" << LL_ENDL; + } + return handled; +} + + +bool LLToolObjPicker::handleHover(S32 x, S32 y, MASK mask) +{ + LLView *viewp = gViewerWindow->getRootView(); + bool handled = viewp->handleHover(x, y, mask); + if (!handled) + { + // Used to do pick on hover. Now we just always display the cursor. + ECursorType cursor = UI_CURSOR_ARROWLOCKED; + + cursor = UI_CURSOR_TOOLPICKOBJECT3; + + gViewerWindow->setCursor(cursor); + } + return handled; +} + + +void LLToolObjPicker::onMouseCaptureLost() +{ + if (mExitCallback) + { + mExitCallback(mExitCallbackData); + + mExitCallback = NULL; + mExitCallbackData = NULL; + } + + mPicked = false; + mHitObjectID.setNull(); +} + +// virtual +void LLToolObjPicker::setExitCallback(void (*callback)(void *), void *callback_data) +{ + mExitCallback = callback; + mExitCallbackData = callback_data; +} + +// virtual +void LLToolObjPicker::handleSelect() +{ + LLTool::handleSelect(); + setMouseCapture(true); +} + +// virtual +void LLToolObjPicker::handleDeselect() +{ + if (hasMouseCapture()) + { + LLTool::handleDeselect(); + setMouseCapture(false); + } +} + + + -- cgit v1.2.3