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/lltextureview.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltextureview.h') diff --git a/indra/newview/lltextureview.h b/indra/newview/lltextureview.h index 900b4e17d8..5428dbd141 100644 --- a/indra/newview/lltextureview.h +++ b/indra/newview/lltextureview.h @@ -46,8 +46,8 @@ public: ~LLTextureView(); /*virtual*/ void draw(); - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleMouseUp(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 handleKey(KEY key, MASK mask, BOOL called_from_parent); static void addDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); } -- cgit v1.2.3 From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/lltextureview.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'indra/newview/lltextureview.h') diff --git a/indra/newview/lltextureview.h b/indra/newview/lltextureview.h index 5428dbd141..dff10d4fbe 100644 --- a/indra/newview/lltextureview.h +++ b/indra/newview/lltextureview.h @@ -45,18 +45,17 @@ protected: public: ~LLTextureView(); - /*virtual*/ void draw(); - /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); + void draw() override; + bool handleMouseDown(S32 x, S32 y, MASK mask) override; + bool handleMouseUp(S32 x, S32 y, MASK mask) override; + bool handleKey(KEY key, MASK mask, bool called_from_parent) override; static void addDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); } static void removeDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); } static void clearDebugImages() { sDebugImages.clear(); } private: - BOOL addBar(LLViewerFetchedTexture *image, BOOL hilight = FALSE); - void removeAllBars(); + bool addBar(LLViewerFetchedTexture *image, S32 hilight = 0); private: BOOL mFreezeView; -- 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/lltextureview.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/lltextureview.h') diff --git a/indra/newview/lltextureview.h b/indra/newview/lltextureview.h index dff10d4fbe..8e7aa34e78 100644 --- a/indra/newview/lltextureview.h +++ b/indra/newview/lltextureview.h @@ -58,9 +58,9 @@ private: bool addBar(LLViewerFetchedTexture *image, S32 hilight = 0); private: - BOOL mFreezeView; - BOOL mOrderFetch; - BOOL mPrintList; + bool mFreezeView; + bool mOrderFetch; + bool mPrintList; LLTextBox *mInfoTextp; -- 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/lltextureview.h | 158 +++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 79 deletions(-) (limited to 'indra/newview/lltextureview.h') diff --git a/indra/newview/lltextureview.h b/indra/newview/lltextureview.h index 79dbb30d82..77ffe7d809 100644 --- a/indra/newview/lltextureview.h +++ b/indra/newview/lltextureview.h @@ -1,79 +1,79 @@ -/** - * @file lltextureview.h - * @brief LLTextureView 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_LLTEXTUREVIEW_H -#define LL_LLTEXTUREVIEW_H - -#include "llcontainerview.h" - -class LLViewerFetchedTexture; -class LLTextureBar; -class LLGLTexMemBar; -class LLAvatarTexBar; - -class LLTextureView : public LLContainerView -{ - friend class LLTextureBar; - friend class LLGLTexMemBar; - friend class LLAvatarTexBar; -protected: - LLTextureView(const Params&); - friend class LLUICtrlFactory; -public: - ~LLTextureView(); - - void draw() override; - bool handleMouseDown(S32 x, S32 y, MASK mask) override; - bool handleMouseUp(S32 x, S32 y, MASK mask) override; - bool handleKey(KEY key, MASK mask, bool called_from_parent) override; - - static void addDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); } - static void removeDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); } - static void clearDebugImages() { sDebugImages.clear(); } - -private: - bool addBar(LLViewerFetchedTexture *image, S32 hilight = 0); - -private: - bool mFreezeView; - bool mOrderFetch; - bool mPrintList; - - LLTextBox *mInfoTextp; - - std::vector mTextureBars; - U32 mNumTextureBars; - - LLGLTexMemBar* mGLTexMemBar; - LLAvatarTexBar* mAvatarTexBar; -public: - static std::set sDebugImages; -}; - -class LLGLTexSizeBar; - -extern LLTextureView *gTextureView; -#endif // LL_TEXTURE_VIEW_H +/** + * @file lltextureview.h + * @brief LLTextureView 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_LLTEXTUREVIEW_H +#define LL_LLTEXTUREVIEW_H + +#include "llcontainerview.h" + +class LLViewerFetchedTexture; +class LLTextureBar; +class LLGLTexMemBar; +class LLAvatarTexBar; + +class LLTextureView : public LLContainerView +{ + friend class LLTextureBar; + friend class LLGLTexMemBar; + friend class LLAvatarTexBar; +protected: + LLTextureView(const Params&); + friend class LLUICtrlFactory; +public: + ~LLTextureView(); + + void draw() override; + bool handleMouseDown(S32 x, S32 y, MASK mask) override; + bool handleMouseUp(S32 x, S32 y, MASK mask) override; + bool handleKey(KEY key, MASK mask, bool called_from_parent) override; + + static void addDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); } + static void removeDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); } + static void clearDebugImages() { sDebugImages.clear(); } + +private: + bool addBar(LLViewerFetchedTexture *image, S32 hilight = 0); + +private: + bool mFreezeView; + bool mOrderFetch; + bool mPrintList; + + LLTextBox *mInfoTextp; + + std::vector mTextureBars; + U32 mNumTextureBars; + + LLGLTexMemBar* mGLTexMemBar; + LLAvatarTexBar* mAvatarTexBar; +public: + static std::set sDebugImages; +}; + +class LLGLTexSizeBar; + +extern LLTextureView *gTextureView; +#endif // LL_TEXTURE_VIEW_H -- cgit v1.2.3