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/llpanelmarketplaceinbox.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelmarketplaceinbox.h') diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h index 952e3a333a..199d98366f 100644 --- a/indra/newview/llpanelmarketplaceinbox.h +++ b/indra/newview/llpanelmarketplaceinbox.h @@ -48,11 +48,11 @@ public: LLPanelMarketplaceInbox(const Params& p = getDefaultParams()); ~LLPanelMarketplaceInbox(); - /*virtual*/ BOOL postBuild(); + bool postBuild() override; - /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg); + bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg) override; - /*virtual*/ void draw(); + void draw() override; LLInventoryPanel * setupInventoryPanel(); -- cgit v1.2.3 From 0fb52bd372aad468c890fc57f4ae3b8be7dad463 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 21 Feb 2024 03:31:20 +0200 Subject: viewer#848 Xcode buildfix --- indra/newview/llpanelmarketplaceinbox.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelmarketplaceinbox.h') diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h index 199d98366f..6d79d8cf55 100644 --- a/indra/newview/llpanelmarketplaceinbox.h +++ b/indra/newview/llpanelmarketplaceinbox.h @@ -68,7 +68,7 @@ private: void onSelectionChange(); - void onFocusReceived(); + void onFocusReceived() override; private: LLUICtrl * mFreshCountCtrl; -- 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/llpanelmarketplaceinbox.h | 162 ++++++++++++++++---------------- 1 file changed, 81 insertions(+), 81 deletions(-) (limited to 'indra/newview/llpanelmarketplaceinbox.h') diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h index cc0d792d0f..e711bb5e5c 100644 --- a/indra/newview/llpanelmarketplaceinbox.h +++ b/indra/newview/llpanelmarketplaceinbox.h @@ -1,81 +1,81 @@ -/** - * @file llpanelmarketplaceinbox.h - * @brief Panel for marketplace inbox - * -* $LicenseInfo:firstyear=2011&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_LLPANELMARKETPLACEINBOX_H -#define LL_LLPANELMARKETPLACEINBOX_H - -#include "llpanel.h" -#include "llfolderview.h" -class LLButton; -class LLInventoryPanel; -class LLUICtrl; - -class LLPanelMarketplaceInbox : public LLPanel -{ -public: - - struct Params : public LLInitParam::Block - {}; - - LOG_CLASS(LLPanelMarketplaceInbox); - - // RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8 - static const LLPanelMarketplaceInbox::Params& getDefaultParams(); - - LLPanelMarketplaceInbox(const Params& p = getDefaultParams()); - ~LLPanelMarketplaceInbox(); - - bool postBuild() override; - - bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg) override; - - void draw() override; - - LLInventoryPanel * setupInventoryPanel(); - - void onClearSearch(); - void onFilterEdit(const std::string& search_string); - - U32 getFreshItemCount() const; - U32 getTotalItemCount() const; - - std::string getBadgeString() const; - -private: - - void onSelectionChange(); - - void onFocusReceived() override; - -private: - LLUICtrl * mFreshCountCtrl; - LLButton * mInboxButton; - LLInventoryPanel * mInventoryPanel; - LLSaveFolderState* mSavedFolderState; -}; - - -#endif //LL_LLPANELMARKETPLACEINBOX_H +/** + * @file llpanelmarketplaceinbox.h + * @brief Panel for marketplace inbox + * +* $LicenseInfo:firstyear=2011&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_LLPANELMARKETPLACEINBOX_H +#define LL_LLPANELMARKETPLACEINBOX_H + +#include "llpanel.h" +#include "llfolderview.h" +class LLButton; +class LLInventoryPanel; +class LLUICtrl; + +class LLPanelMarketplaceInbox : public LLPanel +{ +public: + + struct Params : public LLInitParam::Block + {}; + + LOG_CLASS(LLPanelMarketplaceInbox); + + // RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8 + static const LLPanelMarketplaceInbox::Params& getDefaultParams(); + + LLPanelMarketplaceInbox(const Params& p = getDefaultParams()); + ~LLPanelMarketplaceInbox(); + + bool postBuild() override; + + bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg) override; + + void draw() override; + + LLInventoryPanel * setupInventoryPanel(); + + void onClearSearch(); + void onFilterEdit(const std::string& search_string); + + U32 getFreshItemCount() const; + U32 getTotalItemCount() const; + + std::string getBadgeString() const; + +private: + + void onSelectionChange(); + + void onFocusReceived() override; + +private: + LLUICtrl * mFreshCountCtrl; + LLButton * mInboxButton; + LLInventoryPanel * mInventoryPanel; + LLSaveFolderState* mSavedFolderState; +}; + + +#endif //LL_LLPANELMARKETPLACEINBOX_H -- cgit v1.2.3